From 06bf6f29465730f319b3e26929f511dc022563b2 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 22 Feb 2013 08:27:28 +0100 Subject: [PATCH] use one mcore only --- plugin.yml | 6 +- .../massivecraft/{mcore5 => mcore}/Conf.java | 8 +- .../{mcore5 => mcore}/InternalListener.java | 22 ++-- .../massivecraft/{mcore5 => mcore}/Lang.java | 2 +- .../massivecraft/{mcore5 => mcore}/MCore.java | 40 +++---- .../{mcore5 => mcore}/MPlugin.java | 14 +-- .../massivecraft/{mcore5 => mcore}/PS.java | 18 ++-- .../{mcore5 => mcore}/Permission.java | 4 +- .../{mcore5 => mcore}/Predictate.java | 2 +- .../{mcore5 => mcore}/Prioritized.java | 2 +- .../{mcore5 => mcore}/PriorityComparator.java | 2 +- .../ReversePriorityComparator.java | 2 +- .../{mcore5 => mcore}/SimpleConfig.java | 6 +- .../adapter/FireworkEffectAdapter.java | 12 +-- .../adapter/InventoryAdapter.java | 20 ++-- .../adapter/ItemStackAdapter.java | 16 +-- .../adapter/ItemStackAdapterV1.java | 16 +-- .../adapter/ItemStackAdapterV2.java | 20 ++-- .../adapter/MongoURIAdapter.java | 18 ++-- .../{mcore5 => mcore}/adapter/NBType.java | 2 +- .../adapter/NbtGsonConverter.java | 10 +- .../{mcore5 => mcore}/adapter/PSAdapter.java | 18 ++-- .../adapter/PolymorphicAdapter.java | 20 ++-- .../adapter/PotionEffectAdapter.java | 6 +- .../cmd/BukkitGlueCommand.java | 8 +- .../{mcore5 => mcore}/cmd/CmdMcore.java | 10 +- .../{mcore5 => mcore}/cmd/HelpCommand.java | 8 +- .../{mcore5 => mcore}/cmd/MCommand.java | 24 ++--- .../{mcore5 => mcore}/cmd/VisibilityMode.java | 2 +- .../cmd/arg/ARAbstractPrimitive.java | 2 +- .../cmd/arg/ARAbstractSelect.java | 4 +- .../{mcore5 => mcore}/cmd/arg/ARAspect.java | 8 +- .../{mcore5 => mcore}/cmd/arg/ARBoolean.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARByte.java | 2 +- .../cmd/arg/ARChatColor.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARDate.java | 2 +- .../cmd/arg/ARDifficulty.java | 4 +- .../{mcore5 => mcore}/cmd/arg/ARDouble.java | 2 +- .../cmd/arg/AREnvironment.java | 4 +- .../{mcore5 => mcore}/cmd/arg/ARFloat.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARGameMode.java | 4 +- .../{mcore5 => mcore}/cmd/arg/ARInteger.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARLong.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARMaterial.java | 2 +- .../cmd/arg/ARMillisDiff.java | 6 +- .../cmd/arg/ARMultiverse.java | 8 +- .../{mcore5 => mcore}/cmd/arg/ARPlayer.java | 8 +- .../{mcore5 => mcore}/cmd/arg/ARSender.java | 8 +- .../cmd/arg/ARSenderEntity.java | 8 +- .../{mcore5 => mcore}/cmd/arg/ARSenderId.java | 6 +- .../cmd/arg/ARSenderIdAbstract.java | 6 +- .../cmd/arg/ARSenderIdAbstractPredsource.java | 4 +- .../{mcore5 => mcore}/cmd/arg/ARString.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARUniverse.java | 6 +- .../{mcore5 => mcore}/cmd/arg/ARWorld.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ARWorldId.java | 4 +- .../cmd/arg/ARWorldType.java | 4 +- .../cmd/arg/ArgPredictate.java | 2 +- .../cmd/arg/ArgPredictateAnd.java | 2 +- .../cmd/arg/ArgPredictateStringEqualsLC.java | 2 +- .../ArgPredictateStringIsOnlineSenderId.java | 4 +- .../cmd/arg/ArgPredictateStringStartsLC.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ArgReader.java | 2 +- .../{mcore5 => mcore}/cmd/arg/ArgResult.java | 2 +- .../{mcore5 => mcore}/cmd/req/IReq.java | 4 +- .../{mcore5 => mcore}/cmd/req/ReqHasPerm.java | 6 +- .../cmd/req/ReqIsPlayer.java | 6 +- .../event/MCoreAfterPlayerRespawnEvent.java | 2 +- .../event/MCoreAfterPlayerTeleportEvent.java | 2 +- .../{mcore5 => mcore}/event/MCoreEvent.java | 2 +- .../event/MCorePlayerLeaveEvent.java | 2 +- .../event/MCoreSenderEvent.java | 2 +- .../event/MCoreSenderRegisterEvent.java | 2 +- .../event/MCoreSenderUnregisterEvent.java | 2 +- .../integration/Integration.java | 6 +- .../integration/IntegrationFeatures.java | 2 +- .../IntegrationFeaturesAbstract.java | 2 +- .../mixin/DisplayNameMixin.java | 2 +- .../mixin/DisplayNameMixinAbstract.java | 4 +- .../mixin/DisplayNameMixinDefault.java | 2 +- .../{mcore5 => mcore}/mixin/KickMixin.java | 2 +- .../mixin/KickMixinAbstract.java | 2 +- .../mixin/KickMixinDefault.java | 4 +- .../mixin/ListNameMixin.java | 2 +- .../mixin/ListNameMixinAbstract.java | 4 +- .../mixin/ListNameMixinDefault.java | 2 +- .../{mcore5 => mcore}/mixin/MessageMixin.java | 2 +- .../mixin/MessageMixinAbstract.java | 4 +- .../mixin/MessageMixinDefault.java | 4 +- .../{mcore5 => mcore}/mixin/Mixin.java | 4 +- .../{mcore5 => mcore}/mixin/PlayedMixin.java | 2 +- .../mixin/PlayedMixinAbstract.java | 2 +- .../mixin/PlayedMixinDefault.java | 6 +- .../mixin/ScheduledTeleport.java | 6 +- .../mixin/ScheduledTeleportListener.java | 6 +- .../mixin/SenderIdMixin.java | 2 +- .../mixin/SenderIdMixinAbstract.java | 2 +- .../mixin/SenderIdMixinDefault.java | 16 +-- .../mixin/SenderPsMixin.java | 4 +- .../mixin/SenderPsMixinAbstract.java | 2 +- .../mixin/SenderPsMixinDefault.java | 4 +- .../mixin/TeleportMixin.java | 4 +- .../mixin/TeleportMixinAbstract.java | 14 +-- .../mixin/TeleportMixinDefault.java | 8 +- .../mixin/TeleporterException.java | 2 +- .../mixin/VisibilityMixin.java | 2 +- .../mixin/VisibilityMixinAbstract.java | 2 +- .../mixin/VisibilityMixinDefault.java | 4 +- .../{mcore5 => mcore}/mixin/WorldMixin.java | 4 +- .../mixin/WorldMixinAbstract.java | 2 +- .../mixin/WorldMixinDefault.java | 6 +- .../sender/BasicCommandSender.java | 6 +- .../sender/BasicServerOperator.java | 2 +- .../sender/FakeBlockCommandSender.java | 2 +- .../{mcore5 => mcore}/store/Coll.java | 14 +-- .../store/CollInterface.java | 10 +- .../{mcore5 => mcore}/store/Colls.java | 8 +- .../{mcore5 => mcore}/store/Db.java | 2 +- .../{mcore5 => mcore}/store/DbAbstract.java | 2 +- .../{mcore5 => mcore}/store/DbGson.java | 6 +- .../{mcore5 => mcore}/store/DbMongo.java | 6 +- .../{mcore5 => mcore}/store/Driver.java | 6 +- .../store/DriverAbstract.java | 4 +- .../{mcore5 => mcore}/store/DriverGson.java | 18 ++-- .../{mcore5 => mcore}/store/DriverMongo.java | 22 ++-- .../{mcore5 => mcore}/store/Entity.java | 8 +- .../store/ExamineThread.java | 2 +- .../store/JsonFileFilter.java | 2 +- .../{mcore5 => mcore}/store/MStore.java | 4 +- .../{mcore5 => mcore}/store/MStoreUtil.java | 4 +- .../store/ModificationState.java | 2 +- .../{mcore5 => mcore}/store/SenderColl.java | 10 +- .../{mcore5 => mcore}/store/SenderEntity.java | 6 +- .../store/SenderIdSource.java | 2 +- .../store/SenderIdSourceCombined.java | 2 +- .../SenderIdSourceMixinAllPlayerIds.java | 4 +- .../SenderIdSourceMixinAllSenderIds.java | 4 +- .../store/accessor/Accessor.java | 2 +- .../store/accessor/AccessorUtil.java | 2 +- .../store/accessor/EntityAccessor.java | 2 +- .../accessor/EntityAccessorAbstract.java | 2 +- .../accessor/EntityAccessorPerProperty.java | 2 +- .../store/accessor/EntityGetter.java | 2 +- .../store/accessor/EntityGlue.java | 2 +- .../store/accessor/EntitySetter.java | 2 +- .../store/accessor/PropertyAccessor.java | 2 +- .../accessor/PropertyAccessorComposite.java | 2 +- .../store/accessor/PropertyGetter.java | 2 +- .../PropertyGetterFieldReflection.java | 2 +- .../PropertyGetterMethodReflection.java | 2 +- .../store/accessor/PropertySetter.java | 2 +- .../PropertySetterFieldReflection.java | 2 +- .../PropertySetterMethodReflection.java | 2 +- .../store/idstrategy/IdStrategy.java | 4 +- .../store/idstrategy/IdStrategyAbstract.java | 4 +- .../store/idstrategy/IdStrategyAiGson.java | 8 +- .../store/idstrategy/IdStrategyAiMongo.java | 12 +-- .../store/idstrategy/IdStrategyOidGson.java | 6 +- .../store/idstrategy/IdStrategyOidMongo.java | 6 +- .../IdStrategyUuidMongoAndGson.java | 4 +- .../storeadapter/MongoGsonConverter.java | 20 ++-- .../store/storeadapter/StoreAdapter.java | 4 +- .../storeadapter/StoreAdapterAbstract.java | 2 +- .../store/storeadapter/StoreAdapterGson.java | 6 +- .../store/storeadapter/StoreAdapterMongo.java | 8 +- .../{mcore5 => mcore}/usys/Aspect.java | 8 +- .../{mcore5 => mcore}/usys/AspectColl.java | 6 +- .../{mcore5 => mcore}/usys/Multiverse.java | 10 +- .../usys/MultiverseColl.java | 6 +- .../{mcore5 => mcore}/usys/cmd/CmdUsys.java | 12 +-- .../usys/cmd/CmdUsysAspect.java | 10 +- .../usys/cmd/CmdUsysAspectList.java | 16 +-- .../usys/cmd/CmdUsysAspectShow.java | 14 +-- .../usys/cmd/CmdUsysAspectUse.java | 16 +-- .../usys/cmd/CmdUsysMultiverse.java | 10 +- .../usys/cmd/CmdUsysMultiverseDel.java | 14 +-- .../usys/cmd/CmdUsysMultiverseList.java | 16 +-- .../usys/cmd/CmdUsysMultiverseNew.java | 10 +- .../usys/cmd/CmdUsysMultiverseShow.java | 18 ++-- .../usys/cmd/CmdUsysUniverse.java | 10 +- .../usys/cmd/CmdUsysUniverseClear.java | 14 +-- .../usys/cmd/CmdUsysUniverseDel.java | 14 +-- .../usys/cmd/CmdUsysUniverseNew.java | 12 +-- .../usys/cmd/CmdUsysWorld.java | 12 +-- .../{mcore5 => mcore}/util/BiomeUtil.java | 2 +- .../util/BukkitCommandUtil.java | 2 +- .../{mcore5 => mcore}/util/ClassLoadHack.java | 2 +- .../{mcore5 => mcore}/util/DiscUtil.java | 2 +- .../{mcore5 => mcore}/util/EventUtil.java | 2 +- .../{mcore5 => mcore}/util/IntervalUtil.java | 4 +- .../{mcore5 => mcore}/util/InventoryUtil.java | 2 +- .../{mcore5 => mcore}/util/LibLoader.java | 6 +- .../{mcore5 => mcore}/util/LightUtil.java | 2 +- .../{mcore5 => mcore}/util/MUtil.java | 20 ++-- .../{mcore5 => mcore}/util/PermUtil.java | 6 +- .../{mcore5 => mcore}/util/PlayerUtil.java | 2 +- .../util/PotionPaketUtil.java | 2 +- .../{mcore5 => mcore}/util/SenderUtil.java | 10 +- .../{mcore5 => mcore}/util/SmokeUtil.java | 2 +- .../{mcore5 => mcore}/util/TextWrapper.java | 2 +- .../util/ThrownPotionUtil.java | 2 +- .../{mcore5 => mcore}/util/TimeDiffUtil.java | 2 +- .../{mcore5 => mcore}/util/TimeUnit.java | 2 +- .../{mcore5 => mcore}/util/Txt.java | 2 +- .../util/extractor/Extractor.java | 2 +- .../util/extractor/ExtractorLogic.java | 8 +- .../util/extractor/ExtractorPlayer.java | 2 +- .../util/extractor/ExtractorPlayerName.java | 2 +- .../util/extractor/ExtractorSender.java | 2 +- .../util/extractor/ExtractorSenderId.java | 2 +- .../util/extractor/ExtractorWorld.java | 2 +- .../util/extractor/ExtractorWorldName.java | 2 +- .../{mcore5 => mcore}/xlib/bson/BSON.java | 4 +- .../xlib/bson/BSONCallback.java | 4 +- .../xlib/bson/BSONDecoder.java | 2 +- .../xlib/bson/BSONEncoder.java | 4 +- .../xlib/bson/BSONException.java | 2 +- .../xlib/bson/BSONLazyDecoder.java | 2 +- .../xlib/bson/BSONObject.java | 2 +- .../xlib/bson/BasicBSONCallback.java | 4 +- .../xlib/bson/BasicBSONDecoder.java | 14 +-- .../xlib/bson/BasicBSONEncoder.java | 74 ++++++------- .../xlib/bson/BasicBSONObject.java | 6 +- .../xlib/bson/EmptyBSONCallback.java | 4 +- .../xlib/bson/KeyCachingLazyBSONObject.java | 4 +- .../xlib/bson/LazyBSONCallback.java | 6 +- .../xlib/bson/LazyBSONDecoder.java | 4 +- .../xlib/bson/LazyBSONList.java | 4 +- .../xlib/bson/LazyBSONObject.java | 8 +- .../xlib/bson/LazyDBList.java | 8 +- .../xlib/bson/NewBSONDecoder.java | 8 +- .../xlib/bson/Transformer.java | 2 +- .../xlib/bson/io/BSONByteBuffer.java | 4 +- .../xlib/bson/io/BasicOutputBuffer.java | 2 +- .../{mcore5 => mcore}/xlib/bson/io/Bits.java | 2 +- .../xlib/bson/io/OutputBuffer.java | 4 +- .../xlib/bson/io/PoolOutputBuffer.java | 6 +- .../xlib/bson/io/UTF8Encoding.java | 2 +- .../xlib/bson/io/package.html | 0 .../{mcore5 => mcore}/xlib/bson/package.html | 0 .../xlib/bson/types/BSONTimestamp.java | 2 +- .../xlib/bson/types/BasicBSONList.java | 6 +- .../xlib/bson/types/Binary.java | 4 +- .../xlib/bson/types/Code.java | 2 +- .../xlib/bson/types/CodeWScope.java | 4 +- .../xlib/bson/types/MaxKey.java | 2 +- .../xlib/bson/types/MinKey.java | 2 +- .../xlib/bson/types/ObjectId.java | 2 +- .../xlib/bson/types/Symbol.java | 2 +- .../xlib/bson/types/package.html | 0 .../bson/util/AbstractCopyOnWriteMap.java | 8 +- .../xlib/bson/util/Assertions.java | 2 +- .../xlib/bson/util/ClassAncestry.java | 4 +- .../xlib/bson/util/ClassMap.java | 2 +- .../xlib/bson/util/ComputingMap.java | 4 +- .../xlib/bson/util/CopyOnWriteMap.java | 8 +- .../xlib/bson/util/Function.java | 2 +- .../xlib/bson/util/SimplePool.java | 2 +- .../xlib/bson/util/StringRangeSet.java | 2 +- .../xlib/bson/util/annotations/GuardedBy.java | 2 +- .../xlib/bson/util/annotations/Immutable.java | 2 +- .../bson/util/annotations/NotThreadSafe.java | 2 +- .../bson/util/annotations/ThreadSafe.java | 2 +- .../xlib/bson/util/package.html | 0 .../xlib/gson/DefaultDateTypeAdapter.java | 20 ++-- .../xlib/gson/ExclusionStrategy.java | 8 +- .../xlib/gson/FieldAttributes.java | 4 +- .../xlib/gson/FieldNamingPolicy.java | 8 +- .../xlib/gson/FieldNamingStrategy.java | 2 +- .../{mcore5 => mcore}/xlib/gson/Gson.java | 100 +++++++++--------- .../xlib/gson/GsonBuilder.java | 42 ++++---- .../xlib/gson/InstanceCreator.java | 4 +- .../xlib/gson/JsonArray.java | 10 +- .../xlib/gson/JsonDeserializationContext.java | 10 +- .../xlib/gson/JsonDeserializer.java | 12 +-- .../xlib/gson/JsonElement.java | 14 +-- .../xlib/gson/JsonIOException.java | 4 +- .../{mcore5 => mcore}/xlib/gson/JsonNull.java | 6 +- .../xlib/gson/JsonObject.java | 14 +-- .../xlib/gson/JsonParseException.java | 4 +- .../xlib/gson/JsonParser.java | 20 ++-- .../xlib/gson/JsonPrimitive.java | 10 +- .../xlib/gson/JsonSerializationContext.java | 8 +- .../xlib/gson/JsonSerializer.java | 10 +- .../xlib/gson/JsonStreamParser.java | 18 ++-- .../xlib/gson/JsonSyntaxException.java | 4 +- .../xlib/gson/LongSerializationPolicy.java | 6 +- .../xlib/gson/TreeTypeAdapter.java | 28 ++--- .../xlib/gson/TypeAdapter.java | 28 ++--- .../xlib/gson/TypeAdapterFactory.java | 10 +- .../xlib/gson/annotations/Expose.java | 8 +- .../xlib/gson/annotations/SerializedName.java | 10 +- .../xlib/gson/annotations/Since.java | 8 +- .../xlib/gson/annotations/Until.java | 8 +- .../xlib/gson/annotations/package-info.java | 4 +- .../gson/internal/$Gson$Preconditions.java | 2 +- .../xlib/gson/internal/$Gson$Types.java | 6 +- .../gson/internal/ConstructorConstructor.java | 10 +- .../xlib/gson/internal/Excluder.java | 28 ++--- .../gson/internal/GsonInternalAccess.java | 12 +-- .../internal/JsonReaderInternalAccess.java | 6 +- .../gson/internal/LazilyParsedNumber.java | 2 +- .../xlib/gson/internal/ObjectConstructor.java | 2 +- .../xlib/gson/internal/Pair.java | 4 +- .../xlib/gson/internal/Primitives.java | 4 +- .../xlib/gson/internal/Streams.java | 20 ++-- .../xlib/gson/internal/UnsafeAllocator.java | 4 +- .../gson/internal/bind/ArrayTypeAdapter.java | 22 ++-- .../internal/bind/BigDecimalTypeAdapter.java | 12 +-- .../internal/bind/BigIntegerTypeAdapter.java | 12 +-- .../bind/CollectionTypeAdapterFactory.java | 24 ++--- .../gson/internal/bind/DateTypeAdapter.java | 20 ++-- .../gson/internal/bind/JsonTreeReader.java | 16 +-- .../gson/internal/bind/JsonTreeWriter.java | 14 +-- .../internal/bind/MapTypeAdapterFactory.java | 40 +++---- .../gson/internal/bind/ObjectTypeAdapter.java | 18 ++-- .../bind/ReflectiveTypeAdapterFactory.java | 36 +++---- .../internal/bind/SqlDateTypeAdapter.java | 20 ++-- .../gson/internal/bind/TimeTypeAdapter.java | 20 ++-- .../bind/TypeAdapterRuntimeTypeWrapper.java | 14 +-- .../xlib/gson/internal/bind/TypeAdapters.java | 34 +++--- .../xlib/gson/internal/package-info.java | 2 +- .../mcore/xlib/gson/package-info.java | 11 ++ .../xlib/gson/reflect/TypeToken.java | 8 +- .../xlib/gson/reflect/package-info.java | 2 +- .../xlib/gson/stream/JsonReader.java | 16 +-- .../xlib/gson/stream/JsonScope.java | 2 +- .../xlib/gson/stream/JsonToken.java | 2 +- .../xlib/gson/stream/JsonWriter.java | 6 +- .../gson/stream/MalformedJsonException.java | 4 +- .../xlib/gson/stream/StringPool.java | 2 +- .../xlib/mongodb/BasicDBList.java | 6 +- .../xlib/mongodb/BasicDBObject.java | 6 +- .../xlib/mongodb/BasicDBObjectBuilder.java | 2 +- .../{mcore5 => mcore}/xlib/mongodb/Bytes.java | 12 +-- .../xlib/mongodb/CommandResult.java | 2 +- .../{mcore5 => mcore}/xlib/mongodb/DB.java | 28 ++--- .../xlib/mongodb/DBAddress.java | 2 +- .../xlib/mongodb/DBApiLayer.java | 20 ++-- .../xlib/mongodb/DBCallback.java | 4 +- .../xlib/mongodb/DBCallbackFactory.java | 2 +- .../xlib/mongodb/DBCollection.java | 44 ++++---- .../xlib/mongodb/DBConnector.java | 2 +- .../xlib/mongodb/DBCursor.java | 6 +- .../xlib/mongodb/DBDecoder.java | 4 +- .../xlib/mongodb/DBDecoderFactory.java | 2 +- .../xlib/mongodb/DBEncoder.java | 6 +- .../xlib/mongodb/DBEncoderFactory.java | 2 +- .../xlib/mongodb/DBObject.java | 4 +- .../xlib/mongodb/DBPointer.java | 4 +- .../xlib/mongodb/DBPort.java | 4 +- .../xlib/mongodb/DBPortPool.java | 4 +- .../{mcore5 => mcore}/xlib/mongodb/DBRef.java | 4 +- .../xlib/mongodb/DBRefBase.java | 2 +- .../xlib/mongodb/DBTCPConnector.java | 4 +- .../xlib/mongodb/DefaultDBCallback.java | 8 +- .../xlib/mongodb/DefaultDBDecoder.java | 4 +- .../xlib/mongodb/DefaultDBEncoder.java | 14 +-- .../xlib/mongodb/GroupCommand.java | 2 +- .../xlib/mongodb/LazyDBCallback.java | 6 +- .../xlib/mongodb/LazyDBDecoder.java | 4 +- .../xlib/mongodb/LazyDBEncoder.java | 6 +- .../xlib/mongodb/LazyDBObject.java | 8 +- .../xlib/mongodb/LazyWriteableDBCallback.java | 2 +- .../xlib/mongodb/LazyWriteableDBDecoder.java | 2 +- .../xlib/mongodb/LazyWriteableDBObject.java | 8 +- .../xlib/mongodb/MapReduceCommand.java | 2 +- .../xlib/mongodb/MapReduceOutput.java | 2 +- .../{mcore5 => mcore}/xlib/mongodb/Mongo.java | 22 ++-- .../xlib/mongodb/MongoException.java | 4 +- .../xlib/mongodb/MongoInternalException.java | 2 +- .../xlib/mongodb/MongoOptions.java | 4 +- .../xlib/mongodb/MongoURI.java | 2 +- .../xlib/mongodb/OutMessage.java | 8 +- .../xlib/mongodb/QueryBuilder.java | 2 +- .../xlib/mongodb/QueryOperators.java | 2 +- .../xlib/mongodb/RawDBObject.java | 50 ++++----- .../xlib/mongodb/ReadPreference.java | 2 +- .../xlib/mongodb/ReflectionDBObject.java | 4 +- .../xlib/mongodb/ReplicaSetStatus.java | 8 +- .../xlib/mongodb/Response.java | 4 +- .../xlib/mongodb/ServerAddress.java | 2 +- .../xlib/mongodb/ServerError.java | 4 +- .../xlib/mongodb/WriteConcern.java | 2 +- .../xlib/mongodb/WriteResult.java | 2 +- .../xlib/mongodb/gridfs/CLI.java | 8 +- .../xlib/mongodb/gridfs/GridFS.java | 20 ++-- .../xlib/mongodb/gridfs/GridFSDBFile.java | 10 +- .../xlib/mongodb/gridfs/GridFSFile.java | 12 +-- .../xlib/mongodb/gridfs/GridFSInputFile.java | 18 ++-- .../xlib/mongodb/gridfs/package.html | 0 .../xlib/mongodb/io/ByteBufferFactory.java | 2 +- .../xlib/mongodb/io/ByteBufferHolder.java | 2 +- .../mongodb/io/ByteBufferInputStream.java | 2 +- .../mongodb/io/ByteBufferOutputStream.java | 2 +- .../xlib/mongodb/io/ByteStream.java | 2 +- .../xlib/mongodb/package.html | 0 .../util/AbstractObjectSerializer.java | 2 +- .../xlib/mongodb/util/Args.java | 2 +- .../xlib/mongodb/util/Base64Codec.java | 2 +- .../util/ClassMapBasedObjectSerializer.java | 6 +- .../xlib/mongodb/util/FastStack.java | 2 +- .../xlib/mongodb/util/Hash.java | 2 +- .../xlib/mongodb/util/IdentitySet.java | 2 +- .../xlib/mongodb/util/JSON.java | 10 +- .../xlib/mongodb/util/JSONCallback.java | 28 ++--- .../xlib/mongodb/util/JSONParseException.java | 2 +- .../xlib/mongodb/util/JSONSerializers.java | 12 +-- .../xlib/mongodb/util/MyAsserts.java | 2 +- .../xlib/mongodb/util/ObjectSerializer.java | 2 +- .../xlib/mongodb/util/OptionMap.java | 2 +- .../xlib/mongodb/util/SimplePool.java | 2 +- .../xlib/mongodb/util/StringBuilderPool.java | 2 +- .../xlib/mongodb/util/StringParseUtil.java | 2 +- .../xlib/mongodb/util/ThreadPool.java | 2 +- .../xlib/mongodb/util/ThreadUtil.java | 2 +- .../xlib/mongodb/util/TimeConstants.java | 2 +- .../xlib/mongodb/util/UniqueList.java | 2 +- .../xlib/mongodb/util/Util.java | 2 +- .../xlib/mongodb/util/WeakBag.java | 2 +- .../xlib/mongodb/util/package.html | 0 .../mcore5/xlib/gson/package-info.java | 11 -- 422 files changed, 1476 insertions(+), 1476 deletions(-) rename src/com/massivecraft/{mcore5 => mcore}/Conf.java (82%) rename src/com/massivecraft/{mcore5 => mcore}/InternalListener.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/Lang.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/MCore.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/MPlugin.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/PS.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/Permission.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/Predictate.java (63%) rename src/com/massivecraft/{mcore5 => mcore}/Prioritized.java (61%) rename src/com/massivecraft/{mcore5 => mcore}/PriorityComparator.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/ReversePriorityComparator.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/SimpleConfig.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/FireworkEffectAdapter.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/InventoryAdapter.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/ItemStackAdapter.java (76%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/ItemStackAdapterV1.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/ItemStackAdapterV2.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/MongoURIAdapter.java (66%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/NBType.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/NbtGsonConverter.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/PSAdapter.java (66%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/PolymorphicAdapter.java (69%) rename src/com/massivecraft/{mcore5 => mcore}/adapter/PotionEffectAdapter.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/BukkitGlueCommand.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/CmdMcore.java (64%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/HelpCommand.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/MCommand.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/VisibilityMode.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARAbstractPrimitive.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARAbstractSelect.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARAspect.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARBoolean.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARByte.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARChatColor.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARDate.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARDifficulty.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARDouble.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/AREnvironment.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARFloat.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARGameMode.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARInteger.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARLong.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARMaterial.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARMillisDiff.java (81%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARMultiverse.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARPlayer.java (81%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARSender.java (82%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARSenderEntity.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARSenderId.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARSenderIdAbstract.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARSenderIdAbstractPredsource.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARString.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARUniverse.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARWorld.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARWorldId.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ARWorldType.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgPredictate.java (74%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgPredictateAnd.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgPredictateStringEqualsLC.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgPredictateStringIsOnlineSenderId.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgPredictateStringStartsLC.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgReader.java (74%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/arg/ArgResult.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/req/IReq.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/req/ReqHasPerm.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/cmd/req/ReqIsPlayer.java (79%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCoreAfterPlayerRespawnEvent.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCoreAfterPlayerTeleportEvent.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCoreEvent.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCorePlayerLeaveEvent.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCoreSenderEvent.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCoreSenderRegisterEvent.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/event/MCoreSenderUnregisterEvent.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/integration/Integration.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/integration/IntegrationFeatures.java (74%) rename src/com/massivecraft/{mcore5 => mcore}/integration/IntegrationFeaturesAbstract.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/DisplayNameMixin.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/DisplayNameMixinAbstract.java (79%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/DisplayNameMixinDefault.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/KickMixin.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/KickMixinAbstract.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/KickMixinDefault.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/ListNameMixin.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/ListNameMixinAbstract.java (78%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/ListNameMixinDefault.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/MessageMixin.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/MessageMixinAbstract.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/MessageMixinDefault.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/Mixin.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/PlayedMixin.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/PlayedMixinAbstract.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/PlayedMixinDefault.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/ScheduledTeleport.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/ScheduledTeleportListener.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/SenderIdMixin.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/SenderIdMixinAbstract.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/SenderIdMixinDefault.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/SenderPsMixin.java (60%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/SenderPsMixinAbstract.java (62%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/SenderPsMixinDefault.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/TeleportMixin.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/TeleportMixinAbstract.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/TeleportMixinDefault.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/TeleporterException.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/VisibilityMixin.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/VisibilityMixinAbstract.java (63%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/VisibilityMixinDefault.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/WorldMixin.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/WorldMixinAbstract.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/mixin/WorldMixinDefault.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/sender/BasicCommandSender.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/sender/BasicServerOperator.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/sender/FakeBlockCommandSender.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/store/Coll.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/store/CollInterface.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/store/Colls.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/store/Db.java (80%) rename src/com/massivecraft/{mcore5 => mcore}/store/DbAbstract.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/store/DbGson.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/store/DbMongo.java (82%) rename src/com/massivecraft/{mcore5 => mcore}/store/Driver.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/store/DriverAbstract.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/store/DriverGson.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/store/DriverMongo.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/store/Entity.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/store/ExamineThread.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/store/JsonFileFilter.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/store/MStore.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/store/MStoreUtil.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/store/ModificationState.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/store/SenderColl.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/store/SenderEntity.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/store/SenderIdSource.java (73%) rename src/com/massivecraft/{mcore5 => mcore}/store/SenderIdSourceCombined.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/store/SenderIdSourceMixinAllPlayerIds.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/store/SenderIdSourceMixinAllSenderIds.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/Accessor.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/AccessorUtil.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/EntityAccessor.java (61%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/EntityAccessorAbstract.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/EntityAccessorPerProperty.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/EntityGetter.java (61%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/EntityGlue.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/EntitySetter.java (64%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertyAccessor.java (59%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertyAccessorComposite.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertyGetter.java (57%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertyGetterFieldReflection.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertyGetterMethodReflection.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertySetter.java (60%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertySetterFieldReflection.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/store/accessor/PropertySetterMethodReflection.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategy.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategyAbstract.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategyAiGson.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategyAiMongo.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategyOidGson.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategyOidMongo.java (82%) rename src/com/massivecraft/{mcore5 => mcore}/store/idstrategy/IdStrategyUuidMongoAndGson.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/store/storeadapter/MongoGsonConverter.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/store/storeadapter/StoreAdapter.java (75%) rename src/com/massivecraft/{mcore5 => mcore}/store/storeadapter/StoreAdapterAbstract.java (81%) rename src/com/massivecraft/{mcore5 => mcore}/store/storeadapter/StoreAdapterGson.java (81%) rename src/com/massivecraft/{mcore5 => mcore}/store/storeadapter/StoreAdapterMongo.java (75%) rename src/com/massivecraft/{mcore5 => mcore}/usys/Aspect.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/usys/AspectColl.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/usys/Multiverse.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/usys/MultiverseColl.java (76%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsys.java (75%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysAspect.java (75%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysAspectList.java (68%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysAspectShow.java (63%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysAspectUse.java (62%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysMultiverse.java (79%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysMultiverseDel.java (65%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysMultiverseList.java (69%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysMultiverseNew.java (68%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysMultiverseShow.java (76%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysUniverse.java (76%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysUniverseClear.java (73%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysUniverseDel.java (74%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysUniverseNew.java (72%) rename src/com/massivecraft/{mcore5 => mcore}/usys/cmd/CmdUsysWorld.java (79%) rename src/com/massivecraft/{mcore5 => mcore}/util/BiomeUtil.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/util/BukkitCommandUtil.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/util/ClassLoadHack.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/util/DiscUtil.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/util/EventUtil.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/util/IntervalUtil.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/util/InventoryUtil.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/util/LibLoader.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/util/LightUtil.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/util/MUtil.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/util/PermUtil.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/util/PlayerUtil.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/util/PotionPaketUtil.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/util/SenderUtil.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/util/SmokeUtil.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/util/TextWrapper.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/util/ThrownPotionUtil.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/util/TimeDiffUtil.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/util/TimeUnit.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/util/Txt.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/Extractor.java (55%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorLogic.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorPlayer.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorPlayerName.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorSender.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorSenderId.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorWorld.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/util/extractor/ExtractorWorldName.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSON.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSONCallback.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSONDecoder.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSONEncoder.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSONException.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSONLazyDecoder.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BSONObject.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BasicBSONCallback.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BasicBSONDecoder.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BasicBSONEncoder.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/BasicBSONObject.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/EmptyBSONCallback.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/KeyCachingLazyBSONObject.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/LazyBSONCallback.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/LazyBSONDecoder.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/LazyBSONList.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/LazyBSONObject.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/LazyDBList.java (82%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/NewBSONDecoder.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/Transformer.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/BSONByteBuffer.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/BasicOutputBuffer.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/Bits.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/OutputBuffer.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/PoolOutputBuffer.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/UTF8Encoding.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/io/package.html (100%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/package.html (100%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/BSONTimestamp.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/BasicBSONList.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/Binary.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/Code.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/CodeWScope.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/MaxKey.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/MinKey.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/ObjectId.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/Symbol.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/types/package.html (100%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/AbstractCopyOnWriteMap.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/Assertions.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/ClassAncestry.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/ClassMap.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/ComputingMap.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/CopyOnWriteMap.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/Function.java (50%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/SimplePool.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/StringRangeSet.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/annotations/GuardedBy.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/annotations/Immutable.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/annotations/NotThreadSafe.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/annotations/ThreadSafe.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/bson/util/package.html (100%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/DefaultDateTypeAdapter.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/ExclusionStrategy.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/FieldAttributes.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/FieldNamingPolicy.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/FieldNamingStrategy.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/Gson.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/GsonBuilder.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/InstanceCreator.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonArray.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonDeserializationContext.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonDeserializer.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonElement.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonIOException.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonNull.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonObject.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonParseException.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonParser.java (81%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonPrimitive.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonSerializationContext.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonSerializer.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonStreamParser.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/JsonSyntaxException.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/LongSerializationPolicy.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/TreeTypeAdapter.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/TypeAdapter.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/TypeAdapterFactory.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/annotations/Expose.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/annotations/SerializedName.java (86%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/annotations/Since.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/annotations/Until.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/annotations/package-info.java (54%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/$Gson$Preconditions.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/$Gson$Types.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/ConstructorConstructor.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/Excluder.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/GsonInternalAccess.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/JsonReaderInternalAccess.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/LazilyParsedNumber.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/ObjectConstructor.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/Pair.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/Primitives.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/Streams.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/UnsafeAllocator.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/ArrayTypeAdapter.java (80%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/BigDecimalTypeAdapter.java (78%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/BigIntegerTypeAdapter.java (78%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java (80%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/DateTypeAdapter.java (82%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/JsonTreeReader.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/JsonTreeWriter.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/MapTypeAdapterFactory.java (88%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/ObjectTypeAdapter.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/SqlDateTypeAdapter.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/TimeTypeAdapter.java (77%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java (84%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/bind/TypeAdapters.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/internal/package-info.java (82%) create mode 100644 src/com/massivecraft/mcore/xlib/gson/package-info.java rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/reflect/TypeToken.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/reflect/package-info.java (73%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/stream/JsonReader.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/stream/JsonScope.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/stream/JsonToken.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/stream/JsonWriter.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/stream/MalformedJsonException.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/gson/stream/StringPool.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/BasicDBList.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/BasicDBObject.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/BasicDBObjectBuilder.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/Bytes.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/CommandResult.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DB.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBAddress.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBApiLayer.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBCallback.java (87%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBCallbackFactory.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBCollection.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBConnector.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBCursor.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBDecoder.java (90%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBDecoderFactory.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBEncoder.java (83%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBEncoderFactory.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBObject.java (92%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBPointer.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBPort.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBPortPool.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBRef.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBRefBase.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DBTCPConnector.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DefaultDBCallback.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DefaultDBDecoder.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/DefaultDBEncoder.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/GroupCommand.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyDBCallback.java (91%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyDBDecoder.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyDBEncoder.java (89%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyDBObject.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyWriteableDBCallback.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyWriteableDBDecoder.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/LazyWriteableDBObject.java (93%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/MapReduceCommand.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/MapReduceOutput.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/Mongo.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/MongoException.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/MongoInternalException.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/MongoOptions.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/MongoURI.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/OutMessage.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/QueryBuilder.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/QueryOperators.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/RawDBObject.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/ReadPreference.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/ReflectionDBObject.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/ReplicaSetStatus.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/Response.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/ServerAddress.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/ServerError.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/WriteConcern.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/WriteResult.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/gridfs/CLI.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/gridfs/GridFS.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/gridfs/GridFSDBFile.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/gridfs/GridFSFile.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/gridfs/GridFSInputFile.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/gridfs/package.html (100%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/io/ByteBufferFactory.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/io/ByteBufferHolder.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/io/ByteBufferInputStream.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/io/ByteBufferOutputStream.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/io/ByteStream.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/package.html (100%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/AbstractObjectSerializer.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/Args.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/Base64Codec.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/ClassMapBasedObjectSerializer.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/FastStack.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/Hash.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/IdentitySet.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/JSON.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/JSONCallback.java (85%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/JSONParseException.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/JSONSerializers.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/MyAsserts.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/ObjectSerializer.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/OptionMap.java (94%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/SimplePool.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/StringBuilderPool.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/StringParseUtil.java (99%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/ThreadPool.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/ThreadUtil.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/TimeConstants.java (96%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/UniqueList.java (95%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/Util.java (97%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/WeakBag.java (98%) rename src/com/massivecraft/{mcore5 => mcore}/xlib/mongodb/util/package.html (100%) delete mode 100644 src/com/massivecraft/mcore5/xlib/gson/package-info.java diff --git a/plugin.yml b/plugin.yml index e160d8fe..7e188b2e 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ -name: mcore5 -version: 1.1.4 -main: com.massivecraft.mcore5.MCore +name: mcore +version: 6.0.0 +main: com.massivecraft.mcore.MCore load: startup permissions: # -------------------------------------------- # diff --git a/src/com/massivecraft/mcore5/Conf.java b/src/com/massivecraft/mcore/Conf.java similarity index 82% rename from src/com/massivecraft/mcore5/Conf.java rename to src/com/massivecraft/mcore/Conf.java index c48f4eb3..97c881ba 100644 --- a/src/com/massivecraft/mcore5/Conf.java +++ b/src/com/massivecraft/mcore/Conf.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.io.File; import java.util.List; import java.util.Map; import java.util.UUID; -import com.massivecraft.mcore5.cmd.CmdMcore; -import com.massivecraft.mcore5.usys.cmd.CmdUsys; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.cmd.CmdMcore; +import com.massivecraft.mcore.usys.cmd.CmdUsys; +import com.massivecraft.mcore.util.MUtil; public class Conf extends SimpleConfig { diff --git a/src/com/massivecraft/mcore5/InternalListener.java b/src/com/massivecraft/mcore/InternalListener.java similarity index 90% rename from src/com/massivecraft/mcore5/InternalListener.java rename to src/com/massivecraft/mcore/InternalListener.java index 2dfac133..3ea613d7 100644 --- a/src/com/massivecraft/mcore5/InternalListener.java +++ b/src/com/massivecraft/mcore/InternalListener.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.util.HashMap; import java.util.Map; @@ -21,16 +21,16 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; -import com.massivecraft.mcore5.event.MCoreAfterPlayerRespawnEvent; -import com.massivecraft.mcore5.event.MCoreAfterPlayerTeleportEvent; -import com.massivecraft.mcore5.event.MCorePlayerLeaveEvent; -import com.massivecraft.mcore5.event.MCoreSenderRegisterEvent; -import com.massivecraft.mcore5.event.MCoreSenderUnregisterEvent; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.store.Coll; -import com.massivecraft.mcore5.store.SenderColl; -import com.massivecraft.mcore5.util.SenderUtil; -import com.massivecraft.mcore5.util.SmokeUtil; +import com.massivecraft.mcore.event.MCoreAfterPlayerRespawnEvent; +import com.massivecraft.mcore.event.MCoreAfterPlayerTeleportEvent; +import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; +import com.massivecraft.mcore.event.MCoreSenderRegisterEvent; +import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.store.Coll; +import com.massivecraft.mcore.store.SenderColl; +import com.massivecraft.mcore.util.SenderUtil; +import com.massivecraft.mcore.util.SmokeUtil; public class InternalListener implements Listener { diff --git a/src/com/massivecraft/mcore5/Lang.java b/src/com/massivecraft/mcore/Lang.java similarity index 92% rename from src/com/massivecraft/mcore5/Lang.java rename to src/com/massivecraft/mcore/Lang.java index 2ab2fc68..198c19ae 100644 --- a/src/com/massivecraft/mcore5/Lang.java +++ b/src/com/massivecraft/mcore/Lang.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; public class Lang { diff --git a/src/com/massivecraft/mcore5/MCore.java b/src/com/massivecraft/mcore/MCore.java similarity index 77% rename from src/com/massivecraft/mcore5/MCore.java rename to src/com/massivecraft/mcore/MCore.java index 0a9bce5f..4d76502d 100644 --- a/src/com/massivecraft/mcore5/MCore.java +++ b/src/com/massivecraft/mcore/MCore.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.lang.reflect.Modifier; import java.util.Map; @@ -10,25 +10,25 @@ import org.bukkit.ChatColor; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore5.adapter.InventoryAdapter; -import com.massivecraft.mcore5.adapter.ItemStackAdapter; -import com.massivecraft.mcore5.adapter.MongoURIAdapter; -import com.massivecraft.mcore5.adapter.PSAdapter; -import com.massivecraft.mcore5.cmd.CmdMcore; -import com.massivecraft.mcore5.mixin.SenderIdMixinDefault; -import com.massivecraft.mcore5.mixin.ScheduledTeleportListener; -import com.massivecraft.mcore5.store.Coll; -import com.massivecraft.mcore5.store.Db; -import com.massivecraft.mcore5.store.MStore; -import com.massivecraft.mcore5.usys.AspectColl; -import com.massivecraft.mcore5.usys.MultiverseColl; -import com.massivecraft.mcore5.usys.cmd.CmdUsys; -import com.massivecraft.mcore5.util.PlayerUtil; -import com.massivecraft.mcore5.util.TimeDiffUtil; -import com.massivecraft.mcore5.util.TimeUnit; -import com.massivecraft.mcore5.xlib.gson.Gson; -import com.massivecraft.mcore5.xlib.gson.GsonBuilder; -import com.massivecraft.mcore5.xlib.mongodb.MongoURI; +import com.massivecraft.mcore.adapter.InventoryAdapter; +import com.massivecraft.mcore.adapter.ItemStackAdapter; +import com.massivecraft.mcore.adapter.MongoURIAdapter; +import com.massivecraft.mcore.adapter.PSAdapter; +import com.massivecraft.mcore.cmd.CmdMcore; +import com.massivecraft.mcore.mixin.ScheduledTeleportListener; +import com.massivecraft.mcore.mixin.SenderIdMixinDefault; +import com.massivecraft.mcore.store.Coll; +import com.massivecraft.mcore.store.Db; +import com.massivecraft.mcore.store.MStore; +import com.massivecraft.mcore.usys.AspectColl; +import com.massivecraft.mcore.usys.MultiverseColl; +import com.massivecraft.mcore.usys.cmd.CmdUsys; +import com.massivecraft.mcore.util.PlayerUtil; +import com.massivecraft.mcore.util.TimeDiffUtil; +import com.massivecraft.mcore.util.TimeUnit; +import com.massivecraft.mcore.xlib.gson.Gson; +import com.massivecraft.mcore.xlib.gson.GsonBuilder; +import com.massivecraft.mcore.xlib.mongodb.MongoURI; public class MCore extends MPlugin { diff --git a/src/com/massivecraft/mcore5/MPlugin.java b/src/com/massivecraft/mcore/MPlugin.java similarity index 85% rename from src/com/massivecraft/mcore5/MPlugin.java rename to src/com/massivecraft/mcore/MPlugin.java index 6885532a..015694e4 100644 --- a/src/com/massivecraft/mcore5/MPlugin.java +++ b/src/com/massivecraft/mcore/MPlugin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.util.logging.Level; import java.util.logging.Logger; @@ -9,12 +9,12 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import com.massivecraft.mcore5.integration.Integration; -import com.massivecraft.mcore5.integration.IntegrationFeatures; -import com.massivecraft.mcore5.store.Coll; -import com.massivecraft.mcore5.util.Txt; -import com.massivecraft.mcore5.xlib.gson.Gson; -import com.massivecraft.mcore5.xlib.gson.GsonBuilder; +import com.massivecraft.mcore.integration.Integration; +import com.massivecraft.mcore.integration.IntegrationFeatures; +import com.massivecraft.mcore.store.Coll; +import com.massivecraft.mcore.util.Txt; +import com.massivecraft.mcore.xlib.gson.Gson; +import com.massivecraft.mcore.xlib.gson.GsonBuilder; public abstract class MPlugin extends JavaPlugin implements Listener { diff --git a/src/com/massivecraft/mcore5/PS.java b/src/com/massivecraft/mcore/PS.java similarity index 94% rename from src/com/massivecraft/mcore5/PS.java rename to src/com/massivecraft/mcore/PS.java index 5e0877cf..2d8b54d1 100644 --- a/src/com/massivecraft/mcore5/PS.java +++ b/src/com/massivecraft/mcore/PS.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.io.Serializable; import java.text.DecimalFormat; @@ -18,14 +18,14 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import com.massivecraft.mcore5.mixin.TeleportMixinDefault; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.mixin.TeleporterException; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.usys.Multiverse; -import com.massivecraft.mcore5.util.MUtil; -import com.massivecraft.mcore5.util.Txt; -import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.mixin.TeleportMixinDefault; +import com.massivecraft.mcore.mixin.TeleporterException; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.usys.Multiverse; +import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.mcore.util.Txt; +import com.massivecraft.mcore.xlib.gson.annotations.SerializedName; /** * PS stands for PhysicalState. diff --git a/src/com/massivecraft/mcore5/Permission.java b/src/com/massivecraft/mcore/Permission.java similarity index 90% rename from src/com/massivecraft/mcore5/Permission.java rename to src/com/massivecraft/mcore/Permission.java index 082e52bb..257b4e72 100644 --- a/src/com/massivecraft/mcore5/Permission.java +++ b/src/com/massivecraft/mcore/Permission.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore5.util.PermUtil; +import com.massivecraft.mcore.util.PermUtil; public enum Permission { diff --git a/src/com/massivecraft/mcore5/Predictate.java b/src/com/massivecraft/mcore/Predictate.java similarity index 63% rename from src/com/massivecraft/mcore5/Predictate.java rename to src/com/massivecraft/mcore/Predictate.java index dd29e33c..290c241e 100644 --- a/src/com/massivecraft/mcore5/Predictate.java +++ b/src/com/massivecraft/mcore/Predictate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; public interface Predictate { diff --git a/src/com/massivecraft/mcore5/Prioritized.java b/src/com/massivecraft/mcore/Prioritized.java similarity index 61% rename from src/com/massivecraft/mcore5/Prioritized.java rename to src/com/massivecraft/mcore/Prioritized.java index 4a3a6b39..b86315ed 100644 --- a/src/com/massivecraft/mcore5/Prioritized.java +++ b/src/com/massivecraft/mcore/Prioritized.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; public interface Prioritized { diff --git a/src/com/massivecraft/mcore5/PriorityComparator.java b/src/com/massivecraft/mcore/PriorityComparator.java similarity index 91% rename from src/com/massivecraft/mcore5/PriorityComparator.java rename to src/com/massivecraft/mcore/PriorityComparator.java index 8de08ff8..8a10c479 100644 --- a/src/com/massivecraft/mcore5/PriorityComparator.java +++ b/src/com/massivecraft/mcore/PriorityComparator.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.util.Comparator; diff --git a/src/com/massivecraft/mcore5/ReversePriorityComparator.java b/src/com/massivecraft/mcore/ReversePriorityComparator.java similarity index 91% rename from src/com/massivecraft/mcore5/ReversePriorityComparator.java rename to src/com/massivecraft/mcore/ReversePriorityComparator.java index 036aaab9..02aed0c9 100644 --- a/src/com/massivecraft/mcore5/ReversePriorityComparator.java +++ b/src/com/massivecraft/mcore/ReversePriorityComparator.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.util.Comparator; diff --git a/src/com/massivecraft/mcore5/SimpleConfig.java b/src/com/massivecraft/mcore/SimpleConfig.java similarity index 88% rename from src/com/massivecraft/mcore5/SimpleConfig.java rename to src/com/massivecraft/mcore/SimpleConfig.java index 55b4cb69..2f38a466 100644 --- a/src/com/massivecraft/mcore5/SimpleConfig.java +++ b/src/com/massivecraft/mcore/SimpleConfig.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5; +package com.massivecraft.mcore; import java.io.File; -import com.massivecraft.mcore5.store.accessor.Accessor; -import com.massivecraft.mcore5.util.DiscUtil; +import com.massivecraft.mcore.store.accessor.Accessor; +import com.massivecraft.mcore.util.DiscUtil; public class SimpleConfig { diff --git a/src/com/massivecraft/mcore5/adapter/FireworkEffectAdapter.java b/src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java similarity index 89% rename from src/com/massivecraft/mcore5/adapter/FireworkEffectAdapter.java rename to src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java index a8cc8341..559c05b6 100644 --- a/src/com/massivecraft/mcore5/adapter/FireworkEffectAdapter.java +++ b/src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.util.ArrayList; import java.util.Collection; @@ -10,11 +10,11 @@ import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; -import com.massivecraft.mcore5.util.MUtil; -import com.massivecraft.mcore5.xlib.gson.JsonArray; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.mcore.xlib.gson.JsonArray; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; public class FireworkEffectAdapter { diff --git a/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java similarity index 84% rename from src/com/massivecraft/mcore5/adapter/InventoryAdapter.java rename to src/com/massivecraft/mcore/adapter/InventoryAdapter.java index 3feae27c..af47e89e 100644 --- a/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; @@ -6,15 +6,15 @@ import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; public class InventoryAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java b/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java similarity index 76% rename from src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java rename to src/com/massivecraft/mcore/adapter/ItemStackAdapter.java index 01acf424..93e8a107 100644 --- a/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java +++ b/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; public class ItemStackAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java b/src/com/massivecraft/mcore/adapter/ItemStackAdapterV1.java similarity index 89% rename from src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java rename to src/com/massivecraft/mcore/adapter/ItemStackAdapterV1.java index df162105..753e3f3f 100644 --- a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java +++ b/src/com/massivecraft/mcore/adapter/ItemStackAdapterV1.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Field; import java.lang.reflect.Type; @@ -11,13 +11,13 @@ import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; // TODO: This adapter is deprecated as of 2012-12-20. It should be removed in some time. public class ItemStackAdapterV1 implements JsonDeserializer, JsonSerializer diff --git a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java b/src/com/massivecraft/mcore/adapter/ItemStackAdapterV2.java similarity index 93% rename from src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java rename to src/com/massivecraft/mcore/adapter/ItemStackAdapterV2.java index 22e7d766..0e6513a8 100644 --- a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java +++ b/src/com/massivecraft/mcore/adapter/ItemStackAdapterV2.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; import java.util.ArrayList; @@ -26,15 +26,15 @@ import org.bukkit.inventory.meta.Repairable; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.potion.PotionEffect; -import com.massivecraft.mcore5.xlib.gson.JsonArray; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.gson.JsonArray; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; /** * This is a GSON serializer/deserializer for the Bukkit ItemStack. Why not use diff --git a/src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java b/src/com/massivecraft/mcore/adapter/MongoURIAdapter.java similarity index 66% rename from src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java rename to src/com/massivecraft/mcore/adapter/MongoURIAdapter.java index 3c5694fd..26260052 100644 --- a/src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java +++ b/src/com/massivecraft/mcore/adapter/MongoURIAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; -import com.massivecraft.mcore5.xlib.mongodb.MongoURI; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.mongodb.MongoURI; public class MongoURIAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore5/adapter/NBType.java b/src/com/massivecraft/mcore/adapter/NBType.java similarity index 93% rename from src/com/massivecraft/mcore5/adapter/NBType.java rename to src/com/massivecraft/mcore/adapter/NBType.java index 776ca430..145b90ec 100644 --- a/src/com/massivecraft/mcore5/adapter/NBType.java +++ b/src/com/massivecraft/mcore/adapter/NBType.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java b/src/com/massivecraft/mcore/adapter/NbtGsonConverter.java similarity index 93% rename from src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java rename to src/com/massivecraft/mcore/adapter/NbtGsonConverter.java index 24b4d4e5..610fe276 100644 --- a/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java +++ b/src/com/massivecraft/mcore/adapter/NbtGsonConverter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.util.Collection; import java.util.Iterator; @@ -18,10 +18,10 @@ import net.minecraft.server.v1_4_R1.NBTTagLong; import net.minecraft.server.v1_4_R1.NBTTagShort; import net.minecraft.server.v1_4_R1.NBTTagString; -import com.massivecraft.mcore5.xlib.gson.JsonArray; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.gson.JsonArray; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; //TODO: This converter is deprecated as of 2012-12-20. It should be removed in some time. public class NbtGsonConverter diff --git a/src/com/massivecraft/mcore5/adapter/PSAdapter.java b/src/com/massivecraft/mcore/adapter/PSAdapter.java similarity index 66% rename from src/com/massivecraft/mcore5/adapter/PSAdapter.java rename to src/com/massivecraft/mcore/adapter/PSAdapter.java index 8f3334b3..47438e67 100644 --- a/src/com/massivecraft/mcore5/adapter/PSAdapter.java +++ b/src/com/massivecraft/mcore/adapter/PSAdapter.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore5.PS; -import com.massivecraft.mcore5.xlib.gson.Gson; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.mongodb.MongoURI; +import com.massivecraft.mcore.PS; +import com.massivecraft.mcore.xlib.gson.Gson; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.mongodb.MongoURI; public class PSAdapter implements JsonDeserializer { diff --git a/src/com/massivecraft/mcore5/adapter/PolymorphicAdapter.java b/src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java similarity index 69% rename from src/com/massivecraft/mcore5/adapter/PolymorphicAdapter.java rename to src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java index 266bcb6b..ef0121d2 100644 --- a/src/com/massivecraft/mcore5/adapter/PolymorphicAdapter.java +++ b/src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java @@ -1,16 +1,16 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonNull; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonNull; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; public class PolymorphicAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/mcore5/adapter/PotionEffectAdapter.java b/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java similarity index 90% rename from src/com/massivecraft/mcore5/adapter/PotionEffectAdapter.java rename to src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java index a60f9ee0..b263a964 100644 --- a/src/com/massivecraft/mcore5/adapter/PotionEffectAdapter.java +++ b/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.adapter; +package com.massivecraft.mcore.adapter; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonObject; public class PotionEffectAdapter { diff --git a/src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java b/src/com/massivecraft/mcore/cmd/BukkitGlueCommand.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java rename to src/com/massivecraft/mcore/cmd/BukkitGlueCommand.java index eddfbc2d..ee7d0407 100644 --- a/src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java +++ b/src/com/massivecraft/mcore/cmd/BukkitGlueCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd; +package com.massivecraft.mcore.cmd; import java.util.ArrayList; import java.util.List; @@ -8,9 +8,9 @@ import java.util.TreeSet; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.MPlugin; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.MPlugin; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.util.Txt; public class BukkitGlueCommand extends Command { diff --git a/src/com/massivecraft/mcore5/cmd/CmdMcore.java b/src/com/massivecraft/mcore/cmd/CmdMcore.java similarity index 64% rename from src/com/massivecraft/mcore5/cmd/CmdMcore.java rename to src/com/massivecraft/mcore/cmd/CmdMcore.java index cd644a4f..32e1c060 100644 --- a/src/com/massivecraft/mcore5/cmd/CmdMcore.java +++ b/src/com/massivecraft/mcore/cmd/CmdMcore.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.cmd; +package com.massivecraft.mcore.cmd; -import com.massivecraft.mcore5.Conf; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.Conf; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdMcore extends MCommand { diff --git a/src/com/massivecraft/mcore5/cmd/HelpCommand.java b/src/com/massivecraft/mcore/cmd/HelpCommand.java similarity index 84% rename from src/com/massivecraft/mcore5/cmd/HelpCommand.java rename to src/com/massivecraft/mcore/cmd/HelpCommand.java index ff5533d0..550e249c 100644 --- a/src/com/massivecraft/mcore5/cmd/HelpCommand.java +++ b/src/com/massivecraft/mcore/cmd/HelpCommand.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.cmd; +package com.massivecraft.mcore.cmd; import java.util.ArrayList; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARInteger; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARInteger; +import com.massivecraft.mcore.util.Txt; public class HelpCommand extends MCommand { diff --git a/src/com/massivecraft/mcore5/cmd/MCommand.java b/src/com/massivecraft/mcore/cmd/MCommand.java similarity index 92% rename from src/com/massivecraft/mcore5/cmd/MCommand.java rename to src/com/massivecraft/mcore/cmd/MCommand.java index 802be633..6065ff73 100644 --- a/src/com/massivecraft/mcore5/cmd/MCommand.java +++ b/src/com/massivecraft/mcore/cmd/MCommand.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd; +package com.massivecraft.mcore.cmd; import java.util.*; import java.util.Map.Entry; @@ -11,17 +11,17 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.SimpleCommandMap; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.Lang; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.MPlugin; -import com.massivecraft.mcore5.cmd.arg.ArgReader; -import com.massivecraft.mcore5.cmd.arg.ArgResult; -import com.massivecraft.mcore5.cmd.req.IReq; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.util.BukkitCommandUtil; -import com.massivecraft.mcore5.util.PermUtil; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.Lang; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.MPlugin; +import com.massivecraft.mcore.cmd.arg.ArgReader; +import com.massivecraft.mcore.cmd.arg.ArgResult; +import com.massivecraft.mcore.cmd.req.IReq; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.util.BukkitCommandUtil; +import com.massivecraft.mcore.util.PermUtil; +import com.massivecraft.mcore.util.Txt; public abstract class MCommand { diff --git a/src/com/massivecraft/mcore5/cmd/VisibilityMode.java b/src/com/massivecraft/mcore/cmd/VisibilityMode.java similarity index 89% rename from src/com/massivecraft/mcore5/cmd/VisibilityMode.java rename to src/com/massivecraft/mcore/cmd/VisibilityMode.java index 6bb154a4..26d40d38 100644 --- a/src/com/massivecraft/mcore5/cmd/VisibilityMode.java +++ b/src/com/massivecraft/mcore/cmd/VisibilityMode.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd; +package com.massivecraft.mcore.cmd; public enum VisibilityMode { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java b/src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java similarity index 88% rename from src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java rename to src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java index eef611ba..e5998100 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java b/src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java similarity index 89% rename from src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java rename to src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java index b7e707d3..729e3f16 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.util.Txt; public abstract class ARAbstractSelect implements ArgReader { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARAspect.java b/src/com/massivecraft/mcore/cmd/arg/ARAspect.java similarity index 77% rename from src/com/massivecraft/mcore5/cmd/arg/ARAspect.java rename to src/com/massivecraft/mcore/cmd/arg/ARAspect.java index 4ff52564..9a7ccdfb 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARAspect.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARAspect.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.usys.AspectColl; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.usys.AspectColl; public class ARAspect extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java b/src/com/massivecraft/mcore/cmd/arg/ARBoolean.java similarity index 89% rename from src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java rename to src/com/massivecraft/mcore/cmd/arg/ARBoolean.java index 9ff70c75..3966a3bd 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARBoolean.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARBoolean extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARByte.java b/src/com/massivecraft/mcore/cmd/arg/ARByte.java similarity index 86% rename from src/com/massivecraft/mcore5/cmd/arg/ARByte.java rename to src/com/massivecraft/mcore/cmd/arg/ARByte.java index 6dd8c05c..d68b26bf 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARByte.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARByte.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARByte extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARChatColor.java b/src/com/massivecraft/mcore/cmd/arg/ARChatColor.java similarity index 92% rename from src/com/massivecraft/mcore5/cmd/arg/ARChatColor.java rename to src/com/massivecraft/mcore/cmd/arg/ARChatColor.java index d9d12741..3a1fc622 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARChatColor.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARChatColor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARDate.java b/src/com/massivecraft/mcore/cmd/arg/ARDate.java similarity index 89% rename from src/com/massivecraft/mcore5/cmd/arg/ARDate.java rename to src/com/massivecraft/mcore/cmd/arg/ARDate.java index e3d6d61e..a047f492 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARDate.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARDate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARDifficulty.java b/src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/arg/ARDifficulty.java rename to src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java index 09ae9b8e..efb4eda0 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARDifficulty.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.Difficulty; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.util.MUtil; public class ARDifficulty extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARDouble.java b/src/com/massivecraft/mcore/cmd/arg/ARDouble.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/arg/ARDouble.java rename to src/com/massivecraft/mcore/cmd/arg/ARDouble.java index 22c6ba98..3143f8eb 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARDouble.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARDouble.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARDouble extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java b/src/com/massivecraft/mcore/cmd/arg/AREnvironment.java similarity index 88% rename from src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java rename to src/com/massivecraft/mcore/cmd/arg/AREnvironment.java index 31924b81..92c8c68e 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java +++ b/src/com/massivecraft/mcore/cmd/arg/AREnvironment.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.World.Environment; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.util.MUtil; public class AREnvironment extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARFloat.java b/src/com/massivecraft/mcore/cmd/arg/ARFloat.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/arg/ARFloat.java rename to src/com/massivecraft/mcore/cmd/arg/ARFloat.java index af3291a5..b466bd1f 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARFloat.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARFloat.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARFloat extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARGameMode.java b/src/com/massivecraft/mcore/cmd/arg/ARGameMode.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/arg/ARGameMode.java rename to src/com/massivecraft/mcore/cmd/arg/ARGameMode.java index b670c160..aed76df7 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARGameMode.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARGameMode.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.util.MUtil; public class ARGameMode extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARInteger.java b/src/com/massivecraft/mcore/cmd/arg/ARInteger.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/arg/ARInteger.java rename to src/com/massivecraft/mcore/cmd/arg/ARInteger.java index 1d97f5d4..0500695d 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARInteger.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARInteger.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARInteger extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARLong.java b/src/com/massivecraft/mcore/cmd/arg/ARLong.java similarity index 86% rename from src/com/massivecraft/mcore5/cmd/arg/ARLong.java rename to src/com/massivecraft/mcore/cmd/arg/ARLong.java index 939bfff8..2a163edf 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARLong.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARLong.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARLong extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java b/src/com/massivecraft/mcore/cmd/arg/ARMaterial.java similarity index 91% rename from src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java rename to src/com/massivecraft/mcore/cmd/arg/ARMaterial.java index 5e4306c7..750aff67 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARMaterial.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.Material; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARMillisDiff.java b/src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java similarity index 81% rename from src/com/massivecraft/mcore5/cmd/arg/ARMillisDiff.java rename to src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java index a34a89ba..99d35c39 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARMillisDiff.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.TimeDiffUtil; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.util.TimeDiffUtil; +import com.massivecraft.mcore.util.Txt; public class ARMillisDiff implements ArgReader { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java b/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java similarity index 77% rename from src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java rename to src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java index e9b95054..1ec5cb99 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.usys.Multiverse; -import com.massivecraft.mcore5.usys.MultiverseColl; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.usys.Multiverse; +import com.massivecraft.mcore.usys.MultiverseColl; public class ARMultiverse extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARPlayer.java b/src/com/massivecraft/mcore/cmd/arg/ARPlayer.java similarity index 81% rename from src/com/massivecraft/mcore5/cmd/arg/ARPlayer.java rename to src/com/massivecraft/mcore/cmd/arg/ARPlayer.java index dc788b29..3fe00df6 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARPlayer.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.store.SenderIdSourceMixinAllSenderIds; -import com.massivecraft.mcore5.store.SenderIdSource; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.store.SenderIdSource; +import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds; +import com.massivecraft.mcore.util.SenderUtil; public class ARPlayer extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARSender.java b/src/com/massivecraft/mcore/cmd/arg/ARSender.java similarity index 82% rename from src/com/massivecraft/mcore5/cmd/arg/ARSender.java rename to src/com/massivecraft/mcore/cmd/arg/ARSender.java index c85c0035..6a0c073f 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARSender.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARSender.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.store.SenderIdSourceMixinAllSenderIds; -import com.massivecraft.mcore5.store.SenderIdSource; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.store.SenderIdSource; +import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds; +import com.massivecraft.mcore.util.SenderUtil; public class ARSender extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARSenderEntity.java b/src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java similarity index 90% rename from src/com/massivecraft/mcore5/cmd/arg/ARSenderEntity.java rename to src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java index a952661e..8fc01563 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARSenderEntity.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; -import com.massivecraft.mcore5.store.SenderIdSource; -import com.massivecraft.mcore5.store.SenderColl; -import com.massivecraft.mcore5.store.SenderEntity; +import com.massivecraft.mcore.store.SenderColl; +import com.massivecraft.mcore.store.SenderEntity; +import com.massivecraft.mcore.store.SenderIdSource; public class ARSenderEntity> extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARSenderId.java b/src/com/massivecraft/mcore/cmd/arg/ARSenderId.java similarity index 84% rename from src/com/massivecraft/mcore5/cmd/arg/ARSenderId.java rename to src/com/massivecraft/mcore/cmd/arg/ARSenderId.java index 8b4277ed..0de9327b 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARSenderId.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARSenderId.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; -import com.massivecraft.mcore5.store.SenderIdSourceMixinAllSenderIds; -import com.massivecraft.mcore5.store.SenderIdSource; +import com.massivecraft.mcore.store.SenderIdSource; +import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds; public class ARSenderId extends ARSenderIdAbstractPredsource { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstract.java b/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java similarity index 90% rename from src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstract.java rename to src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java index 8544dd81..ef771f99 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstract.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.util.Txt; public abstract class ARSenderIdAbstract implements ArgReader { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstractPredsource.java b/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java similarity index 91% rename from src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstractPredsource.java rename to src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java index 819597f2..0a4a674b 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstractPredsource.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import java.util.TreeSet; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.store.SenderIdSource; +import com.massivecraft.mcore.store.SenderIdSource; public abstract class ARSenderIdAbstractPredsource extends ARSenderIdAbstract { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARString.java b/src/com/massivecraft/mcore/cmd/arg/ARString.java similarity index 86% rename from src/com/massivecraft/mcore5/cmd/arg/ARString.java rename to src/com/massivecraft/mcore/cmd/arg/ARString.java index e3310288..98f29356 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARString.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARString.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; public class ARString extends ARAbstractPrimitive { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java b/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java similarity index 87% rename from src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java rename to src/com/massivecraft/mcore/cmd/arg/ARUniverse.java index d5193f2c..31f077be 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.ArrayList; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.usys.Multiverse; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.usys.Multiverse; +import com.massivecraft.mcore.util.Txt; public class ARUniverse implements ArgReader { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARWorld.java b/src/com/massivecraft/mcore/cmd/arg/ARWorld.java similarity index 91% rename from src/com/massivecraft/mcore5/cmd/arg/ARWorld.java rename to src/com/massivecraft/mcore/cmd/arg/ARWorld.java index e090702d..13a98b69 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARWorld.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARWorld.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARWorldId.java b/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java similarity index 89% rename from src/com/massivecraft/mcore5/cmd/arg/ARWorldId.java rename to src/com/massivecraft/mcore/cmd/arg/ARWorldId.java index c587b165..2642f5e8 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARWorldId.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.ArrayList; import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.mixin.Mixin; +import com.massivecraft.mcore.mixin.Mixin; public class ARWorldId extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java b/src/com/massivecraft/mcore/cmd/arg/ARWorldType.java similarity index 89% rename from src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java rename to src/com/massivecraft/mcore/cmd/arg/ARWorldType.java index a14e8e75..23e81d25 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARWorldType.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.Collection; import org.bukkit.WorldType; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.util.MUtil; public class ARWorldType extends ARAbstractSelect { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictate.java b/src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java similarity index 74% rename from src/com/massivecraft/mcore5/cmd/arg/ArgPredictate.java rename to src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java index 6cd3b308..159b6446 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictate.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateAnd.java b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java similarity index 90% rename from src/com/massivecraft/mcore5/cmd/arg/ArgPredictateAnd.java rename to src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java index 202b37a3..8b3f2142 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateAnd.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringEqualsLC.java b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java similarity index 90% rename from src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringEqualsLC.java rename to src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java index 3e7226b3..72524bdd 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringEqualsLC.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringIsOnlineSenderId.java b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java similarity index 85% rename from src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringIsOnlineSenderId.java rename to src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java index 7983d8e9..81a81832 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringIsOnlineSenderId.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.mixin.Mixin; +import com.massivecraft.mcore.mixin.Mixin; public class ArgPredictateStringIsOnlineSenderId implements ArgPredictate { diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringStartsLC.java b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java similarity index 90% rename from src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringStartsLC.java rename to src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java index 4e750b15..e9a12ce0 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringStartsLC.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgReader.java b/src/com/massivecraft/mcore/cmd/arg/ArgReader.java similarity index 74% rename from src/com/massivecraft/mcore5/cmd/arg/ArgReader.java rename to src/com/massivecraft/mcore/cmd/arg/ArgReader.java index 4d808f23..1cbb1f0c 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgReader.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgReader.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/cmd/arg/ArgResult.java b/src/com/massivecraft/mcore/cmd/arg/ArgResult.java similarity index 91% rename from src/com/massivecraft/mcore5/cmd/arg/ArgResult.java rename to src/com/massivecraft/mcore/cmd/arg/ArgResult.java index 2e1928e1..3b070f45 100644 --- a/src/com/massivecraft/mcore5/cmd/arg/ArgResult.java +++ b/src/com/massivecraft/mcore/cmd/arg/ArgResult.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.cmd.arg; +package com.massivecraft.mcore.cmd.arg; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore5/cmd/req/IReq.java b/src/com/massivecraft/mcore/cmd/req/IReq.java similarity index 77% rename from src/com/massivecraft/mcore5/cmd/req/IReq.java rename to src/com/massivecraft/mcore/cmd/req/IReq.java index 0cbe3d1e..7caf1661 100644 --- a/src/com/massivecraft/mcore5/cmd/req/IReq.java +++ b/src/com/massivecraft/mcore/cmd/req/IReq.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.cmd.req; +package com.massivecraft.mcore.cmd.req; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore.cmd.MCommand; public interface IReq { diff --git a/src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java b/src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java similarity index 77% rename from src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java rename to src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java index 0da05d18..17af6f22 100644 --- a/src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java +++ b/src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.cmd.req; +package com.massivecraft.mcore.cmd.req; import lombok.Getter; import lombok.Setter; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.util.PermUtil; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.util.PermUtil; public class ReqHasPerm implements IReq { diff --git a/src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java b/src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java similarity index 79% rename from src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java rename to src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java index e5114662..83c88f3b 100644 --- a/src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java +++ b/src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.cmd.req; +package com.massivecraft.mcore.cmd.req; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.Lang; -import com.massivecraft.mcore5.cmd.MCommand; +import com.massivecraft.mcore.Lang; +import com.massivecraft.mcore.cmd.MCommand; public class ReqIsPlayer implements IReq { diff --git a/src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java b/src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java similarity index 94% rename from src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java rename to src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java index 1334a571..e748b7b4 100644 --- a/src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java +++ b/src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import lombok.Getter; diff --git a/src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java b/src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java similarity index 94% rename from src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java rename to src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java index f5c01734..ad6ec33c 100644 --- a/src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java +++ b/src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import lombok.Getter; diff --git a/src/com/massivecraft/mcore5/event/MCoreEvent.java b/src/com/massivecraft/mcore/event/MCoreEvent.java similarity index 85% rename from src/com/massivecraft/mcore5/event/MCoreEvent.java rename to src/com/massivecraft/mcore/event/MCoreEvent.java index 8b26ebb0..0409b39e 100644 --- a/src/com/massivecraft/mcore5/event/MCoreEvent.java +++ b/src/com/massivecraft/mcore/event/MCoreEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import org.bukkit.Bukkit; import org.bukkit.event.Event; diff --git a/src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java b/src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java similarity index 95% rename from src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java rename to src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java index 57fb7253..0f34c277 100644 --- a/src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java +++ b/src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/event/MCoreSenderEvent.java b/src/com/massivecraft/mcore/event/MCoreSenderEvent.java similarity index 89% rename from src/com/massivecraft/mcore5/event/MCoreSenderEvent.java rename to src/com/massivecraft/mcore/event/MCoreSenderEvent.java index 8992e950..4c405b24 100644 --- a/src/com/massivecraft/mcore5/event/MCoreSenderEvent.java +++ b/src/com/massivecraft/mcore/event/MCoreSenderEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/event/MCoreSenderRegisterEvent.java b/src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java similarity index 91% rename from src/com/massivecraft/mcore5/event/MCoreSenderRegisterEvent.java rename to src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java index dea24004..80ed1be8 100644 --- a/src/com/massivecraft/mcore5/event/MCoreSenderRegisterEvent.java +++ b/src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/com/massivecraft/mcore5/event/MCoreSenderUnregisterEvent.java b/src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java similarity index 91% rename from src/com/massivecraft/mcore5/event/MCoreSenderUnregisterEvent.java rename to src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java index 94fe7782..bedf2aa6 100644 --- a/src/com/massivecraft/mcore5/event/MCoreSenderUnregisterEvent.java +++ b/src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.event; +package com.massivecraft.mcore.event; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; diff --git a/src/com/massivecraft/mcore5/integration/Integration.java b/src/com/massivecraft/mcore/integration/Integration.java similarity index 92% rename from src/com/massivecraft/mcore5/integration/Integration.java rename to src/com/massivecraft/mcore/integration/Integration.java index 5d312edd..fc3b306f 100644 --- a/src/com/massivecraft/mcore5/integration/Integration.java +++ b/src/com/massivecraft/mcore/integration/Integration.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.integration; +package com.massivecraft.mcore.integration; import java.util.Collection; @@ -12,8 +12,8 @@ import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.plugin.Plugin; -import com.massivecraft.mcore5.MPlugin; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.MPlugin; +import com.massivecraft.mcore.util.Txt; public class Integration implements Listener { diff --git a/src/com/massivecraft/mcore5/integration/IntegrationFeatures.java b/src/com/massivecraft/mcore/integration/IntegrationFeatures.java similarity index 74% rename from src/com/massivecraft/mcore5/integration/IntegrationFeatures.java rename to src/com/massivecraft/mcore/integration/IntegrationFeatures.java index 885cb291..41eff0af 100644 --- a/src/com/massivecraft/mcore5/integration/IntegrationFeatures.java +++ b/src/com/massivecraft/mcore/integration/IntegrationFeatures.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.integration; +package com.massivecraft.mcore.integration; import java.util.List; diff --git a/src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java b/src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java similarity index 91% rename from src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java rename to src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java index 87a895e4..4b487ece 100644 --- a/src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java +++ b/src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.integration; +package com.massivecraft.mcore.integration; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore5/mixin/DisplayNameMixin.java b/src/com/massivecraft/mcore/mixin/DisplayNameMixin.java similarity index 86% rename from src/com/massivecraft/mcore5/mixin/DisplayNameMixin.java rename to src/com/massivecraft/mcore/mixin/DisplayNameMixin.java index 652d677b..1250c5af 100644 --- a/src/com/massivecraft/mcore5/mixin/DisplayNameMixin.java +++ b/src/com/massivecraft/mcore/mixin/DisplayNameMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/mixin/DisplayNameMixinAbstract.java b/src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java similarity index 79% rename from src/com/massivecraft/mcore5/mixin/DisplayNameMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java index 24f1ef29..23430730 100644 --- a/src/com/massivecraft/mcore5/mixin/DisplayNameMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.util.SenderUtil; public abstract class DisplayNameMixinAbstract implements DisplayNameMixin { diff --git a/src/com/massivecraft/mcore5/mixin/DisplayNameMixinDefault.java b/src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java similarity index 93% rename from src/com/massivecraft/mcore5/mixin/DisplayNameMixinDefault.java rename to src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java index 4d364fda..92d9ace5 100644 --- a/src/com/massivecraft/mcore5/mixin/DisplayNameMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Map; import java.util.TreeMap; diff --git a/src/com/massivecraft/mcore5/mixin/KickMixin.java b/src/com/massivecraft/mcore/mixin/KickMixin.java similarity index 84% rename from src/com/massivecraft/mcore5/mixin/KickMixin.java rename to src/com/massivecraft/mcore/mixin/KickMixin.java index 89961d92..b9de3c2e 100644 --- a/src/com/massivecraft/mcore5/mixin/KickMixin.java +++ b/src/com/massivecraft/mcore/mixin/KickMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/mixin/KickMixinAbstract.java b/src/com/massivecraft/mcore/mixin/KickMixinAbstract.java similarity index 83% rename from src/com/massivecraft/mcore5/mixin/KickMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/KickMixinAbstract.java index d6bcda18..641d59ef 100644 --- a/src/com/massivecraft/mcore5/mixin/KickMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/KickMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/mixin/KickMixinDefault.java b/src/com/massivecraft/mcore/mixin/KickMixinDefault.java similarity index 87% rename from src/com/massivecraft/mcore5/mixin/KickMixinDefault.java rename to src/com/massivecraft/mcore/mixin/KickMixinDefault.java index 6454271b..c7ff0f3f 100644 --- a/src/com/massivecraft/mcore5/mixin/KickMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/KickMixinDefault.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.util.SenderUtil; public class KickMixinDefault extends KickMixinAbstract { diff --git a/src/com/massivecraft/mcore5/mixin/ListNameMixin.java b/src/com/massivecraft/mcore/mixin/ListNameMixin.java similarity index 85% rename from src/com/massivecraft/mcore5/mixin/ListNameMixin.java rename to src/com/massivecraft/mcore/mixin/ListNameMixin.java index 807a04f9..59f389f8 100644 --- a/src/com/massivecraft/mcore5/mixin/ListNameMixin.java +++ b/src/com/massivecraft/mcore/mixin/ListNameMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/mixin/ListNameMixinAbstract.java b/src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java similarity index 78% rename from src/com/massivecraft/mcore5/mixin/ListNameMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java index 4626e186..a7897da0 100644 --- a/src/com/massivecraft/mcore5/mixin/ListNameMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.util.SenderUtil; public abstract class ListNameMixinAbstract implements ListNameMixin { diff --git a/src/com/massivecraft/mcore5/mixin/ListNameMixinDefault.java b/src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java similarity index 93% rename from src/com/massivecraft/mcore5/mixin/ListNameMixinDefault.java rename to src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java index 59a6593c..9c11c2b4 100644 --- a/src/com/massivecraft/mcore5/mixin/ListNameMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Map; import java.util.TreeMap; diff --git a/src/com/massivecraft/mcore5/mixin/MessageMixin.java b/src/com/massivecraft/mcore/mixin/MessageMixin.java similarity index 93% rename from src/com/massivecraft/mcore5/mixin/MessageMixin.java rename to src/com/massivecraft/mcore/mixin/MessageMixin.java index 8029551d..c80f7481 100644 --- a/src/com/massivecraft/mcore5/mixin/MessageMixin.java +++ b/src/com/massivecraft/mcore/mixin/MessageMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Collection; diff --git a/src/com/massivecraft/mcore5/mixin/MessageMixinAbstract.java b/src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java similarity index 91% rename from src/com/massivecraft/mcore5/mixin/MessageMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java index 5f31708d..aa79407e 100644 --- a/src/com/massivecraft/mcore5/mixin/MessageMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.ArrayList; import java.util.Arrays; @@ -7,7 +7,7 @@ import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.util.Txt; public abstract class MessageMixinAbstract implements MessageMixin { diff --git a/src/com/massivecraft/mcore5/mixin/MessageMixinDefault.java b/src/com/massivecraft/mcore/mixin/MessageMixinDefault.java similarity index 89% rename from src/com/massivecraft/mcore5/mixin/MessageMixinDefault.java rename to src/com/massivecraft/mcore/mixin/MessageMixinDefault.java index 95a5cdbf..2a4c913d 100644 --- a/src/com/massivecraft/mcore5/mixin/MessageMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/MessageMixinDefault.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Collection; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.util.SenderUtil; public class MessageMixinDefault extends MessageMixinAbstract { diff --git a/src/com/massivecraft/mcore5/mixin/Mixin.java b/src/com/massivecraft/mcore/mixin/Mixin.java similarity index 96% rename from src/com/massivecraft/mcore5/mixin/Mixin.java rename to src/com/massivecraft/mcore/mixin/Mixin.java index 5dc416dd..1c1a8d3d 100644 --- a/src/com/massivecraft/mcore5/mixin/Mixin.java +++ b/src/com/massivecraft/mcore/mixin/Mixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Collection; import java.util.List; @@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore.PS; public class Mixin { diff --git a/src/com/massivecraft/mcore5/mixin/PlayedMixin.java b/src/com/massivecraft/mcore/mixin/PlayedMixin.java similarity index 84% rename from src/com/massivecraft/mcore5/mixin/PlayedMixin.java rename to src/com/massivecraft/mcore/mixin/PlayedMixin.java index a26c3a11..e8f0bfe1 100644 --- a/src/com/massivecraft/mcore5/mixin/PlayedMixin.java +++ b/src/com/massivecraft/mcore/mixin/PlayedMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; public interface PlayedMixin { diff --git a/src/com/massivecraft/mcore5/mixin/PlayedMixinAbstract.java b/src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java similarity index 85% rename from src/com/massivecraft/mcore5/mixin/PlayedMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java index b00a8092..8f3a999d 100644 --- a/src/com/massivecraft/mcore5/mixin/PlayedMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; public abstract class PlayedMixinAbstract implements PlayedMixin { diff --git a/src/com/massivecraft/mcore5/mixin/PlayedMixinDefault.java b/src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java similarity index 88% rename from src/com/massivecraft/mcore5/mixin/PlayedMixinDefault.java rename to src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java index dc3dae7c..13efaba0 100644 --- a/src/com/massivecraft/mcore5/mixin/PlayedMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.io.File; @@ -6,8 +6,8 @@ import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.util.MUtil; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.mcore.util.SenderUtil; public class PlayedMixinDefault extends PlayedMixinAbstract { diff --git a/src/com/massivecraft/mcore5/mixin/ScheduledTeleport.java b/src/com/massivecraft/mcore/mixin/ScheduledTeleport.java similarity index 93% rename from src/com/massivecraft/mcore5/mixin/ScheduledTeleport.java rename to src/com/massivecraft/mcore/mixin/ScheduledTeleport.java index 707b3e31..0dc0c19a 100644 --- a/src/com/massivecraft/mcore5/mixin/ScheduledTeleport.java +++ b/src/com/massivecraft/mcore/mixin/ScheduledTeleport.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -6,8 +6,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.PS; public class ScheduledTeleport implements Runnable { diff --git a/src/com/massivecraft/mcore5/mixin/ScheduledTeleportListener.java b/src/com/massivecraft/mcore/mixin/ScheduledTeleportListener.java similarity index 90% rename from src/com/massivecraft/mcore5/mixin/ScheduledTeleportListener.java rename to src/com/massivecraft/mcore/mixin/ScheduledTeleportListener.java index 9815a1d9..172c623f 100644 --- a/src/com/massivecraft/mcore5/mixin/ScheduledTeleportListener.java +++ b/src/com/massivecraft/mcore/mixin/ScheduledTeleportListener.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; @@ -6,8 +6,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.util.MUtil; public class ScheduledTeleportListener implements Listener { diff --git a/src/com/massivecraft/mcore5/mixin/SenderIdMixin.java b/src/com/massivecraft/mcore/mixin/SenderIdMixin.java similarity index 91% rename from src/com/massivecraft/mcore5/mixin/SenderIdMixin.java rename to src/com/massivecraft/mcore/mixin/SenderIdMixin.java index c49cefd6..7337c1bb 100644 --- a/src/com/massivecraft/mcore5/mixin/SenderIdMixin.java +++ b/src/com/massivecraft/mcore/mixin/SenderIdMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Set; diff --git a/src/com/massivecraft/mcore5/mixin/SenderIdMixinAbstract.java b/src/com/massivecraft/mcore/mixin/SenderIdMixinAbstract.java similarity index 84% rename from src/com/massivecraft/mcore5/mixin/SenderIdMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/SenderIdMixinAbstract.java index 46531778..f6f06d83 100644 --- a/src/com/massivecraft/mcore5/mixin/SenderIdMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/SenderIdMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; public abstract class SenderIdMixinAbstract implements SenderIdMixin { diff --git a/src/com/massivecraft/mcore5/mixin/SenderIdMixinDefault.java b/src/com/massivecraft/mcore/mixin/SenderIdMixinDefault.java similarity index 90% rename from src/com/massivecraft/mcore5/mixin/SenderIdMixinDefault.java rename to src/com/massivecraft/mcore/mixin/SenderIdMixinDefault.java index 147e305b..48de0133 100644 --- a/src/com/massivecraft/mcore5/mixin/SenderIdMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/SenderIdMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.Collections; import java.util.Map; @@ -15,13 +15,13 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.event.MCorePlayerLeaveEvent; -import com.massivecraft.mcore5.event.MCoreSenderRegisterEvent; -import com.massivecraft.mcore5.event.MCoreSenderUnregisterEvent; -import com.massivecraft.mcore5.util.MUtil; -import com.massivecraft.mcore5.util.SenderUtil; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.event.MCorePlayerLeaveEvent; +import com.massivecraft.mcore.event.MCoreSenderRegisterEvent; +import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent; +import com.massivecraft.mcore.util.MUtil; +import com.massivecraft.mcore.util.SenderUtil; +import com.massivecraft.mcore.util.Txt; public class SenderIdMixinDefault extends SenderIdMixinAbstract implements Listener { diff --git a/src/com/massivecraft/mcore5/mixin/SenderPsMixin.java b/src/com/massivecraft/mcore/mixin/SenderPsMixin.java similarity index 60% rename from src/com/massivecraft/mcore5/mixin/SenderPsMixin.java rename to src/com/massivecraft/mcore/mixin/SenderPsMixin.java index a14100b4..376e34a6 100644 --- a/src/com/massivecraft/mcore5/mixin/SenderPsMixin.java +++ b/src/com/massivecraft/mcore/mixin/SenderPsMixin.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; -import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore.PS; public interface SenderPsMixin { diff --git a/src/com/massivecraft/mcore5/mixin/SenderPsMixinAbstract.java b/src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java similarity index 62% rename from src/com/massivecraft/mcore5/mixin/SenderPsMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java index 4769e983..38cf5583 100644 --- a/src/com/massivecraft/mcore5/mixin/SenderPsMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; public abstract class SenderPsMixinAbstract implements SenderPsMixin { diff --git a/src/com/massivecraft/mcore5/mixin/SenderPsMixinDefault.java b/src/com/massivecraft/mcore/mixin/SenderPsMixinDefault.java similarity index 88% rename from src/com/massivecraft/mcore5/mixin/SenderPsMixinDefault.java rename to src/com/massivecraft/mcore/mixin/SenderPsMixinDefault.java index 7972343f..757f2e10 100644 --- a/src/com/massivecraft/mcore5/mixin/SenderPsMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/SenderPsMixinDefault.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore.PS; public class SenderPsMixinDefault extends SenderPsMixinAbstract { diff --git a/src/com/massivecraft/mcore5/mixin/TeleportMixin.java b/src/com/massivecraft/mcore/mixin/TeleportMixin.java similarity index 95% rename from src/com/massivecraft/mcore5/mixin/TeleportMixin.java rename to src/com/massivecraft/mcore/mixin/TeleportMixin.java index 1fb86bfd..41c1787e 100644 --- a/src/com/massivecraft/mcore5/mixin/TeleportMixin.java +++ b/src/com/massivecraft/mcore/mixin/TeleportMixin.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore.PS; public interface TeleportMixin { diff --git a/src/com/massivecraft/mcore5/mixin/TeleportMixinAbstract.java b/src/com/massivecraft/mcore/mixin/TeleportMixinAbstract.java similarity index 92% rename from src/com/massivecraft/mcore5/mixin/TeleportMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/TeleportMixinAbstract.java index b44342b1..97171e8d 100644 --- a/src/com/massivecraft/mcore5/mixin/TeleportMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/TeleportMixinAbstract.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore5.Conf; -import com.massivecraft.mcore5.PS; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.util.PermUtil; -import com.massivecraft.mcore5.util.SenderUtil; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.Conf; +import com.massivecraft.mcore.PS; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.util.PermUtil; +import com.massivecraft.mcore.util.SenderUtil; +import com.massivecraft.mcore.util.Txt; public abstract class TeleportMixinAbstract implements TeleportMixin { diff --git a/src/com/massivecraft/mcore5/mixin/TeleportMixinDefault.java b/src/com/massivecraft/mcore/mixin/TeleportMixinDefault.java similarity index 89% rename from src/com/massivecraft/mcore5/mixin/TeleportMixinDefault.java rename to src/com/massivecraft/mcore/mixin/TeleportMixinDefault.java index 34d8da0c..87e8a114 100644 --- a/src/com/massivecraft/mcore5/mixin/TeleportMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/TeleportMixinDefault.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import com.massivecraft.mcore5.PS; -import com.massivecraft.mcore5.util.SenderUtil; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.PS; +import com.massivecraft.mcore.util.SenderUtil; +import com.massivecraft.mcore.util.Txt; public class TeleportMixinDefault extends TeleportMixinAbstract { diff --git a/src/com/massivecraft/mcore5/mixin/TeleporterException.java b/src/com/massivecraft/mcore/mixin/TeleporterException.java similarity index 89% rename from src/com/massivecraft/mcore5/mixin/TeleporterException.java rename to src/com/massivecraft/mcore/mixin/TeleporterException.java index c3321e1d..1913ff58 100644 --- a/src/com/massivecraft/mcore5/mixin/TeleporterException.java +++ b/src/com/massivecraft/mcore/mixin/TeleporterException.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; public class TeleporterException extends Exception { diff --git a/src/com/massivecraft/mcore5/mixin/VisibilityMixin.java b/src/com/massivecraft/mcore/mixin/VisibilityMixin.java similarity index 92% rename from src/com/massivecraft/mcore5/mixin/VisibilityMixin.java rename to src/com/massivecraft/mcore/mixin/VisibilityMixin.java index 276f9602..16a3b4fb 100644 --- a/src/com/massivecraft/mcore5/mixin/VisibilityMixin.java +++ b/src/com/massivecraft/mcore/mixin/VisibilityMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/mcore5/mixin/VisibilityMixinAbstract.java b/src/com/massivecraft/mcore/mixin/VisibilityMixinAbstract.java similarity index 63% rename from src/com/massivecraft/mcore5/mixin/VisibilityMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/VisibilityMixinAbstract.java index e7dcd923..7fd76740 100644 --- a/src/com/massivecraft/mcore5/mixin/VisibilityMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/VisibilityMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; public abstract class VisibilityMixinAbstract implements VisibilityMixin { diff --git a/src/com/massivecraft/mcore5/mixin/VisibilityMixinDefault.java b/src/com/massivecraft/mcore/mixin/VisibilityMixinDefault.java similarity index 92% rename from src/com/massivecraft/mcore5/mixin/VisibilityMixinDefault.java rename to src/com/massivecraft/mcore/mixin/VisibilityMixinDefault.java index 8652f26b..cd5d7013 100644 --- a/src/com/massivecraft/mcore5/mixin/VisibilityMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/VisibilityMixinDefault.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.util.SenderUtil; public class VisibilityMixinDefault extends VisibilityMixinAbstract { diff --git a/src/com/massivecraft/mcore5/mixin/WorldMixin.java b/src/com/massivecraft/mcore/mixin/WorldMixin.java similarity index 88% rename from src/com/massivecraft/mcore5/mixin/WorldMixin.java rename to src/com/massivecraft/mcore/mixin/WorldMixin.java index ccf30ddd..5593c4f6 100644 --- a/src/com/massivecraft/mcore5/mixin/WorldMixin.java +++ b/src/com/massivecraft/mcore/mixin/WorldMixin.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.List; @@ -6,7 +6,7 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore5.PS; +import com.massivecraft.mcore.PS; public interface WorldMixin { diff --git a/src/com/massivecraft/mcore5/mixin/WorldMixinAbstract.java b/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java similarity index 91% rename from src/com/massivecraft/mcore5/mixin/WorldMixinAbstract.java rename to src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java index b16d13be..baa6c0af 100644 --- a/src/com/massivecraft/mcore5/mixin/WorldMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.ArrayList; import java.util.List; diff --git a/src/com/massivecraft/mcore5/mixin/WorldMixinDefault.java b/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java similarity index 92% rename from src/com/massivecraft/mcore5/mixin/WorldMixinDefault.java rename to src/com/massivecraft/mcore/mixin/WorldMixinDefault.java index f842d83e..623badb2 100644 --- a/src/com/massivecraft/mcore5/mixin/WorldMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.mixin; +package com.massivecraft.mcore.mixin; import java.util.ArrayList; import java.util.List; @@ -10,8 +10,8 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore5.PS; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.PS; +import com.massivecraft.mcore.util.MUtil; public class WorldMixinDefault extends WorldMixinAbstract { diff --git a/src/com/massivecraft/mcore5/sender/BasicCommandSender.java b/src/com/massivecraft/mcore/sender/BasicCommandSender.java similarity index 87% rename from src/com/massivecraft/mcore5/sender/BasicCommandSender.java rename to src/com/massivecraft/mcore/sender/BasicCommandSender.java index a3f92cac..1ca9ed3c 100644 --- a/src/com/massivecraft/mcore5/sender/BasicCommandSender.java +++ b/src/com/massivecraft/mcore/sender/BasicCommandSender.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.sender; +package com.massivecraft.mcore.sender; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissibleBase; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.util.SenderUtil; public class BasicCommandSender extends PermissibleBase implements CommandSender { diff --git a/src/com/massivecraft/mcore5/sender/BasicServerOperator.java b/src/com/massivecraft/mcore/sender/BasicServerOperator.java similarity index 89% rename from src/com/massivecraft/mcore5/sender/BasicServerOperator.java rename to src/com/massivecraft/mcore/sender/BasicServerOperator.java index 9e30fe77..69779227 100644 --- a/src/com/massivecraft/mcore5/sender/BasicServerOperator.java +++ b/src/com/massivecraft/mcore/sender/BasicServerOperator.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.sender; +package com.massivecraft.mcore.sender; import org.bukkit.permissions.ServerOperator; diff --git a/src/com/massivecraft/mcore5/sender/FakeBlockCommandSender.java b/src/com/massivecraft/mcore/sender/FakeBlockCommandSender.java similarity index 90% rename from src/com/massivecraft/mcore5/sender/FakeBlockCommandSender.java rename to src/com/massivecraft/mcore/sender/FakeBlockCommandSender.java index 6eeaa2c3..3b28014f 100644 --- a/src/com/massivecraft/mcore5/sender/FakeBlockCommandSender.java +++ b/src/com/massivecraft/mcore/sender/FakeBlockCommandSender.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.sender; +package com.massivecraft.mcore.sender; import org.bukkit.Bukkit; import org.bukkit.block.Block; diff --git a/src/com/massivecraft/mcore5/store/Coll.java b/src/com/massivecraft/mcore/store/Coll.java similarity index 94% rename from src/com/massivecraft/mcore5/store/Coll.java rename to src/com/massivecraft/mcore/store/Coll.java index 5b4c9d1f..15a97a59 100644 --- a/src/com/massivecraft/mcore5/store/Coll.java +++ b/src/com/massivecraft/mcore/store/Coll.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Collection; import java.util.Collections; @@ -12,12 +12,12 @@ import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.CopyOnWriteArrayList; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.MPlugin; -import com.massivecraft.mcore5.Predictate; -import com.massivecraft.mcore5.store.accessor.Accessor; -import com.massivecraft.mcore5.store.idstrategy.IdStrategy; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.MPlugin; +import com.massivecraft.mcore.Predictate; +import com.massivecraft.mcore.store.accessor.Accessor; +import com.massivecraft.mcore.store.idstrategy.IdStrategy; +import com.massivecraft.mcore.store.storeadapter.StoreAdapter; public class Coll> implements CollInterface { diff --git a/src/com/massivecraft/mcore5/store/CollInterface.java b/src/com/massivecraft/mcore/store/CollInterface.java similarity index 91% rename from src/com/massivecraft/mcore5/store/CollInterface.java rename to src/com/massivecraft/mcore/store/CollInterface.java index 0fb258dc..84174cca 100644 --- a/src/com/massivecraft/mcore5/store/CollInterface.java +++ b/src/com/massivecraft/mcore/store/CollInterface.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Collection; import java.util.Comparator; import java.util.Map; -import com.massivecraft.mcore5.MPlugin; -import com.massivecraft.mcore5.Predictate; -import com.massivecraft.mcore5.store.idstrategy.IdStrategy; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore.MPlugin; +import com.massivecraft.mcore.Predictate; +import com.massivecraft.mcore.store.idstrategy.IdStrategy; +import com.massivecraft.mcore.store.storeadapter.StoreAdapter; public interface CollInterface> { diff --git a/src/com/massivecraft/mcore5/store/Colls.java b/src/com/massivecraft/mcore/store/Colls.java similarity index 89% rename from src/com/massivecraft/mcore5/store/Colls.java rename to src/com/massivecraft/mcore/store/Colls.java index 005318ab..97e97044 100644 --- a/src/com/massivecraft/mcore5/store/Colls.java +++ b/src/com/massivecraft/mcore/store/Colls.java @@ -1,13 +1,13 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.usys.Multiverse; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.usys.Multiverse; +import com.massivecraft.mcore.util.MUtil; public abstract class Colls, E, L extends Comparable> { diff --git a/src/com/massivecraft/mcore5/store/Db.java b/src/com/massivecraft/mcore/store/Db.java similarity index 80% rename from src/com/massivecraft/mcore5/store/Db.java rename to src/com/massivecraft/mcore/store/Db.java index 59bd24ea..0afb12e9 100644 --- a/src/com/massivecraft/mcore5/store/Db.java +++ b/src/com/massivecraft/mcore/store/Db.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Set; diff --git a/src/com/massivecraft/mcore5/store/DbAbstract.java b/src/com/massivecraft/mcore/store/DbAbstract.java similarity index 77% rename from src/com/massivecraft/mcore5/store/DbAbstract.java rename to src/com/massivecraft/mcore/store/DbAbstract.java index fd77cf7b..9d4e0476 100644 --- a/src/com/massivecraft/mcore5/store/DbAbstract.java +++ b/src/com/massivecraft/mcore/store/DbAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Set; diff --git a/src/com/massivecraft/mcore5/store/DbGson.java b/src/com/massivecraft/mcore/store/DbGson.java similarity index 83% rename from src/com/massivecraft/mcore5/store/DbGson.java rename to src/com/massivecraft/mcore/store/DbGson.java index b211d0a5..60296543 100644 --- a/src/com/massivecraft/mcore5/store/DbGson.java +++ b/src/com/massivecraft/mcore/store/DbGson.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.io.File; -import com.massivecraft.mcore5.util.DiscUtil; -import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore.util.DiscUtil; +import com.massivecraft.mcore.xlib.gson.JsonElement; public class DbGson extends DbAbstract { diff --git a/src/com/massivecraft/mcore5/store/DbMongo.java b/src/com/massivecraft/mcore/store/DbMongo.java similarity index 82% rename from src/com/massivecraft/mcore5/store/DbMongo.java rename to src/com/massivecraft/mcore/store/DbMongo.java index 21601cc9..e3802353 100644 --- a/src/com/massivecraft/mcore5/store/DbMongo.java +++ b/src/com/massivecraft/mcore/store/DbMongo.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; -import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore5.xlib.mongodb.DB; +import com.massivecraft.mcore.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore.xlib.mongodb.DB; public class DbMongo extends DbAbstract { diff --git a/src/com/massivecraft/mcore5/store/Driver.java b/src/com/massivecraft/mcore/store/Driver.java similarity index 89% rename from src/com/massivecraft/mcore5/store/Driver.java rename to src/com/massivecraft/mcore/store/Driver.java index 51163f11..cbc4bf9f 100644 --- a/src/com/massivecraft/mcore5/store/Driver.java +++ b/src/com/massivecraft/mcore/store/Driver.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.mcore5.store.idstrategy.IdStrategy; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore.store.idstrategy.IdStrategy; +import com.massivecraft.mcore.store.storeadapter.StoreAdapter; public interface Driver { diff --git a/src/com/massivecraft/mcore5/store/DriverAbstract.java b/src/com/massivecraft/mcore/store/DriverAbstract.java similarity index 86% rename from src/com/massivecraft/mcore5/store/DriverAbstract.java rename to src/com/massivecraft/mcore/store/DriverAbstract.java index 7a086d92..6914a10c 100644 --- a/src/com/massivecraft/mcore5/store/DriverAbstract.java +++ b/src/com/massivecraft/mcore/store/DriverAbstract.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.HashMap; import java.util.Map; -import com.massivecraft.mcore5.store.idstrategy.IdStrategy; +import com.massivecraft.mcore.store.idstrategy.IdStrategy; public abstract class DriverAbstract implements Driver { diff --git a/src/com/massivecraft/mcore5/store/DriverGson.java b/src/com/massivecraft/mcore/store/DriverGson.java similarity index 87% rename from src/com/massivecraft/mcore5/store/DriverGson.java rename to src/com/massivecraft/mcore/store/DriverGson.java index ad06b2e8..4a3ffc57 100644 --- a/src/com/massivecraft/mcore5/store/DriverGson.java +++ b/src/com/massivecraft/mcore/store/DriverGson.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.io.File; import java.util.AbstractMap.SimpleEntry; @@ -11,14 +11,14 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import com.massivecraft.mcore5.store.idstrategy.IdStrategyAiGson; -import com.massivecraft.mcore5.store.idstrategy.IdStrategyOidGson; -import com.massivecraft.mcore5.store.idstrategy.IdStrategyUuidMongoAndGson; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapterGson; -import com.massivecraft.mcore5.util.DiscUtil; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonParser; +import com.massivecraft.mcore.store.idstrategy.IdStrategyAiGson; +import com.massivecraft.mcore.store.idstrategy.IdStrategyOidGson; +import com.massivecraft.mcore.store.idstrategy.IdStrategyUuidMongoAndGson; +import com.massivecraft.mcore.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore.store.storeadapter.StoreAdapterGson; +import com.massivecraft.mcore.util.DiscUtil; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonParser; public class DriverGson extends DriverAbstract { diff --git a/src/com/massivecraft/mcore5/store/DriverMongo.java b/src/com/massivecraft/mcore/store/DriverMongo.java similarity index 87% rename from src/com/massivecraft/mcore5/store/DriverMongo.java rename to src/com/massivecraft/mcore/store/DriverMongo.java index 5946052d..f45b9aa0 100644 --- a/src/com/massivecraft/mcore5/store/DriverMongo.java +++ b/src/com/massivecraft/mcore/store/DriverMongo.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.Collection; @@ -9,16 +9,16 @@ import java.util.Set; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.mcore5.store.idstrategy.IdStrategyAiMongo; -import com.massivecraft.mcore5.store.idstrategy.IdStrategyOidMongo; -import com.massivecraft.mcore5.store.idstrategy.IdStrategyUuidMongoAndGson; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapter; -import com.massivecraft.mcore5.store.storeadapter.StoreAdapterMongo; -import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore5.xlib.mongodb.DB; -import com.massivecraft.mcore5.xlib.mongodb.DBCollection; -import com.massivecraft.mcore5.xlib.mongodb.DBCursor; -import com.massivecraft.mcore5.xlib.mongodb.MongoURI; +import com.massivecraft.mcore.store.idstrategy.IdStrategyAiMongo; +import com.massivecraft.mcore.store.idstrategy.IdStrategyOidMongo; +import com.massivecraft.mcore.store.idstrategy.IdStrategyUuidMongoAndGson; +import com.massivecraft.mcore.store.storeadapter.StoreAdapter; +import com.massivecraft.mcore.store.storeadapter.StoreAdapterMongo; +import com.massivecraft.mcore.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore.xlib.mongodb.DB; +import com.massivecraft.mcore.xlib.mongodb.DBCollection; +import com.massivecraft.mcore.xlib.mongodb.DBCursor; +import com.massivecraft.mcore.xlib.mongodb.MongoURI; public class DriverMongo extends DriverAbstract { diff --git a/src/com/massivecraft/mcore5/store/Entity.java b/src/com/massivecraft/mcore/store/Entity.java similarity index 89% rename from src/com/massivecraft/mcore5/store/Entity.java rename to src/com/massivecraft/mcore/store/Entity.java index f2b26952..9884b737 100644 --- a/src/com/massivecraft/mcore5/store/Entity.java +++ b/src/com/massivecraft/mcore/store/Entity.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.store.accessor.Accessor; -import com.massivecraft.mcore5.xlib.gson.Gson; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.store.accessor.Accessor; +import com.massivecraft.mcore.xlib.gson.Gson; /** * Usage of this class is highly optional. You may persist anything. If you are diff --git a/src/com/massivecraft/mcore5/store/ExamineThread.java b/src/com/massivecraft/mcore/store/ExamineThread.java similarity index 90% rename from src/com/massivecraft/mcore5/store/ExamineThread.java rename to src/com/massivecraft/mcore/store/ExamineThread.java index dbee4c7a..ea0ed730 100644 --- a/src/com/massivecraft/mcore5/store/ExamineThread.java +++ b/src/com/massivecraft/mcore/store/ExamineThread.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; public class ExamineThread> extends Thread { diff --git a/src/com/massivecraft/mcore5/store/JsonFileFilter.java b/src/com/massivecraft/mcore/store/JsonFileFilter.java similarity index 88% rename from src/com/massivecraft/mcore5/store/JsonFileFilter.java rename to src/com/massivecraft/mcore/store/JsonFileFilter.java index 4f4c5e59..be8935d3 100644 --- a/src/com/massivecraft/mcore5/store/JsonFileFilter.java +++ b/src/com/massivecraft/mcore/store/JsonFileFilter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.io.File; import java.io.FileFilter; diff --git a/src/com/massivecraft/mcore5/store/MStore.java b/src/com/massivecraft/mcore/store/MStore.java similarity index 88% rename from src/com/massivecraft/mcore5/store/MStore.java rename to src/com/massivecraft/mcore/store/MStore.java index a08f9c2f..8e8933ab 100644 --- a/src/com/massivecraft/mcore5/store/MStore.java +++ b/src/com/massivecraft/mcore/store/MStore.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore.MCore; public class MStore diff --git a/src/com/massivecraft/mcore5/store/MStoreUtil.java b/src/com/massivecraft/mcore/store/MStoreUtil.java similarity index 88% rename from src/com/massivecraft/mcore5/store/MStoreUtil.java rename to src/com/massivecraft/mcore/store/MStoreUtil.java index 91fc3c41..57a39976 100644 --- a/src/com/massivecraft/mcore5/store/MStoreUtil.java +++ b/src/com/massivecraft/mcore/store/MStoreUtil.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import com.massivecraft.mcore5.Predictate; +import com.massivecraft.mcore.Predictate; public class MStoreUtil { diff --git a/src/com/massivecraft/mcore5/store/ModificationState.java b/src/com/massivecraft/mcore/store/ModificationState.java similarity index 90% rename from src/com/massivecraft/mcore5/store/ModificationState.java rename to src/com/massivecraft/mcore/store/ModificationState.java index 4f5d6643..95e9b6b4 100644 --- a/src/com/massivecraft/mcore5/store/ModificationState.java +++ b/src/com/massivecraft/mcore/store/ModificationState.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; public enum ModificationState { diff --git a/src/com/massivecraft/mcore5/store/SenderColl.java b/src/com/massivecraft/mcore/store/SenderColl.java similarity index 92% rename from src/com/massivecraft/mcore5/store/SenderColl.java rename to src/com/massivecraft/mcore/store/SenderColl.java index 5d566693..ad5e5cd4 100644 --- a/src/com/massivecraft/mcore5/store/SenderColl.java +++ b/src/com/massivecraft/mcore/store/SenderColl.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.Collection; @@ -7,10 +7,10 @@ import java.util.List; import org.bukkit.command.CommandSender; -import com.massivecraft.mcore5.MPlugin; -import com.massivecraft.mcore5.Predictate; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.MPlugin; +import com.massivecraft.mcore.Predictate; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.util.MUtil; public class SenderColl> extends Coll implements SenderIdSource { diff --git a/src/com/massivecraft/mcore5/store/SenderEntity.java b/src/com/massivecraft/mcore/store/SenderEntity.java similarity index 92% rename from src/com/massivecraft/mcore5/store/SenderEntity.java rename to src/com/massivecraft/mcore/store/SenderEntity.java index 2c3df29b..65599702 100644 --- a/src/com/massivecraft/mcore5/store/SenderEntity.java +++ b/src/com/massivecraft/mcore/store/SenderEntity.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Collection; @@ -9,8 +9,8 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.mixin.Mixin; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.mixin.Mixin; +import com.massivecraft.mcore.util.SenderUtil; public abstract class SenderEntity> extends Entity { diff --git a/src/com/massivecraft/mcore5/store/SenderIdSource.java b/src/com/massivecraft/mcore/store/SenderIdSource.java similarity index 73% rename from src/com/massivecraft/mcore5/store/SenderIdSource.java rename to src/com/massivecraft/mcore/store/SenderIdSource.java index dd29b019..641521e1 100644 --- a/src/com/massivecraft/mcore5/store/SenderIdSource.java +++ b/src/com/massivecraft/mcore/store/SenderIdSource.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.Collection; diff --git a/src/com/massivecraft/mcore5/store/SenderIdSourceCombined.java b/src/com/massivecraft/mcore/store/SenderIdSourceCombined.java similarity index 92% rename from src/com/massivecraft/mcore5/store/SenderIdSourceCombined.java rename to src/com/massivecraft/mcore/store/SenderIdSourceCombined.java index 02038d69..6e8c81e8 100644 --- a/src/com/massivecraft/mcore5/store/SenderIdSourceCombined.java +++ b/src/com/massivecraft/mcore/store/SenderIdSourceCombined.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore5/store/SenderIdSourceMixinAllPlayerIds.java b/src/com/massivecraft/mcore/store/SenderIdSourceMixinAllPlayerIds.java similarity index 87% rename from src/com/massivecraft/mcore5/store/SenderIdSourceMixinAllPlayerIds.java rename to src/com/massivecraft/mcore/store/SenderIdSourceMixinAllPlayerIds.java index dba71a9a..12b608f0 100644 --- a/src/com/massivecraft/mcore5/store/SenderIdSourceMixinAllPlayerIds.java +++ b/src/com/massivecraft/mcore/store/SenderIdSourceMixinAllPlayerIds.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.massivecraft.mcore5.mixin.Mixin; +import com.massivecraft.mcore.mixin.Mixin; public class SenderIdSourceMixinAllPlayerIds implements SenderIdSource { diff --git a/src/com/massivecraft/mcore5/store/SenderIdSourceMixinAllSenderIds.java b/src/com/massivecraft/mcore/store/SenderIdSourceMixinAllSenderIds.java similarity index 87% rename from src/com/massivecraft/mcore5/store/SenderIdSourceMixinAllSenderIds.java rename to src/com/massivecraft/mcore/store/SenderIdSourceMixinAllSenderIds.java index 97213915..4f793fb4 100644 --- a/src/com/massivecraft/mcore5/store/SenderIdSourceMixinAllSenderIds.java +++ b/src/com/massivecraft/mcore/store/SenderIdSourceMixinAllSenderIds.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.store; +package com.massivecraft.mcore.store; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.massivecraft.mcore5.mixin.Mixin; +import com.massivecraft.mcore.mixin.Mixin; public class SenderIdSourceMixinAllSenderIds implements SenderIdSource { diff --git a/src/com/massivecraft/mcore5/store/accessor/Accessor.java b/src/com/massivecraft/mcore/store/accessor/Accessor.java similarity index 86% rename from src/com/massivecraft/mcore5/store/accessor/Accessor.java rename to src/com/massivecraft/mcore/store/accessor/Accessor.java index d3d76e7b..2353fedf 100644 --- a/src/com/massivecraft/mcore5/store/accessor/Accessor.java +++ b/src/com/massivecraft/mcore/store/accessor/Accessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.util.HashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/store/accessor/AccessorUtil.java b/src/com/massivecraft/mcore/store/accessor/AccessorUtil.java similarity index 95% rename from src/com/massivecraft/mcore5/store/accessor/AccessorUtil.java rename to src/com/massivecraft/mcore/store/accessor/AccessorUtil.java index 22f0fee7..f53c347e 100644 --- a/src/com/massivecraft/mcore5/store/accessor/AccessorUtil.java +++ b/src/com/massivecraft/mcore/store/accessor/AccessorUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore5/store/accessor/EntityAccessor.java b/src/com/massivecraft/mcore/store/accessor/EntityAccessor.java similarity index 61% rename from src/com/massivecraft/mcore5/store/accessor/EntityAccessor.java rename to src/com/massivecraft/mcore/store/accessor/EntityAccessor.java index 957397b8..ae359ef2 100644 --- a/src/com/massivecraft/mcore5/store/accessor/EntityAccessor.java +++ b/src/com/massivecraft/mcore/store/accessor/EntityAccessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public interface EntityAccessor extends EntitySetter, EntityGetter, EntityGlue { diff --git a/src/com/massivecraft/mcore5/store/accessor/EntityAccessorAbstract.java b/src/com/massivecraft/mcore/store/accessor/EntityAccessorAbstract.java similarity index 92% rename from src/com/massivecraft/mcore5/store/accessor/EntityAccessorAbstract.java rename to src/com/massivecraft/mcore/store/accessor/EntityAccessorAbstract.java index a6535dda..7040276d 100644 --- a/src/com/massivecraft/mcore5/store/accessor/EntityAccessorAbstract.java +++ b/src/com/massivecraft/mcore/store/accessor/EntityAccessorAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.util.Collection; diff --git a/src/com/massivecraft/mcore5/store/accessor/EntityAccessorPerProperty.java b/src/com/massivecraft/mcore/store/accessor/EntityAccessorPerProperty.java similarity index 94% rename from src/com/massivecraft/mcore5/store/accessor/EntityAccessorPerProperty.java rename to src/com/massivecraft/mcore/store/accessor/EntityAccessorPerProperty.java index 42da9c00..d9195b54 100644 --- a/src/com/massivecraft/mcore5/store/accessor/EntityAccessorPerProperty.java +++ b/src/com/massivecraft/mcore/store/accessor/EntityAccessorPerProperty.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.util.Collection; import java.util.HashMap; diff --git a/src/com/massivecraft/mcore5/store/accessor/EntityGetter.java b/src/com/massivecraft/mcore/store/accessor/EntityGetter.java similarity index 61% rename from src/com/massivecraft/mcore5/store/accessor/EntityGetter.java rename to src/com/massivecraft/mcore/store/accessor/EntityGetter.java index ff76393b..266b6038 100644 --- a/src/com/massivecraft/mcore5/store/accessor/EntityGetter.java +++ b/src/com/massivecraft/mcore/store/accessor/EntityGetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public interface EntityGetter { diff --git a/src/com/massivecraft/mcore5/store/accessor/EntityGlue.java b/src/com/massivecraft/mcore/store/accessor/EntityGlue.java similarity index 89% rename from src/com/massivecraft/mcore5/store/accessor/EntityGlue.java rename to src/com/massivecraft/mcore/store/accessor/EntityGlue.java index 35b26084..ab0e2aa3 100644 --- a/src/com/massivecraft/mcore5/store/accessor/EntityGlue.java +++ b/src/com/massivecraft/mcore/store/accessor/EntityGlue.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.util.Collection; diff --git a/src/com/massivecraft/mcore5/store/accessor/EntitySetter.java b/src/com/massivecraft/mcore/store/accessor/EntitySetter.java similarity index 64% rename from src/com/massivecraft/mcore5/store/accessor/EntitySetter.java rename to src/com/massivecraft/mcore/store/accessor/EntitySetter.java index b71287bb..16b09b1c 100644 --- a/src/com/massivecraft/mcore5/store/accessor/EntitySetter.java +++ b/src/com/massivecraft/mcore/store/accessor/EntitySetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public interface EntitySetter { diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertyAccessor.java b/src/com/massivecraft/mcore/store/accessor/PropertyAccessor.java similarity index 59% rename from src/com/massivecraft/mcore5/store/accessor/PropertyAccessor.java rename to src/com/massivecraft/mcore/store/accessor/PropertyAccessor.java index 3c300643..4bdc4400 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertyAccessor.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertyAccessor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public interface PropertyAccessor extends PropertySetter, PropertyGetter { diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertyAccessorComposite.java b/src/com/massivecraft/mcore/store/accessor/PropertyAccessorComposite.java similarity index 86% rename from src/com/massivecraft/mcore5/store/accessor/PropertyAccessorComposite.java rename to src/com/massivecraft/mcore/store/accessor/PropertyAccessorComposite.java index ee6df46c..39521da0 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertyAccessorComposite.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertyAccessorComposite.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public class PropertyAccessorComposite implements PropertyAccessor { diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertyGetter.java b/src/com/massivecraft/mcore/store/accessor/PropertyGetter.java similarity index 57% rename from src/com/massivecraft/mcore5/store/accessor/PropertyGetter.java rename to src/com/massivecraft/mcore/store/accessor/PropertyGetter.java index 3ec02c37..fbe45b9f 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertyGetter.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertyGetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public interface PropertyGetter { diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertyGetterFieldReflection.java b/src/com/massivecraft/mcore/store/accessor/PropertyGetterFieldReflection.java similarity index 84% rename from src/com/massivecraft/mcore5/store/accessor/PropertyGetterFieldReflection.java rename to src/com/massivecraft/mcore/store/accessor/PropertyGetterFieldReflection.java index 5c3d7fe9..2300d329 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertyGetterFieldReflection.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertyGetterFieldReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertyGetterMethodReflection.java b/src/com/massivecraft/mcore/store/accessor/PropertyGetterMethodReflection.java similarity index 85% rename from src/com/massivecraft/mcore5/store/accessor/PropertyGetterMethodReflection.java rename to src/com/massivecraft/mcore/store/accessor/PropertyGetterMethodReflection.java index 20d3d524..19226e97 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertyGetterMethodReflection.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertyGetterMethodReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertySetter.java b/src/com/massivecraft/mcore/store/accessor/PropertySetter.java similarity index 60% rename from src/com/massivecraft/mcore5/store/accessor/PropertySetter.java rename to src/com/massivecraft/mcore/store/accessor/PropertySetter.java index 173d16d2..ca3b0409 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertySetter.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertySetter.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; public interface PropertySetter { diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertySetterFieldReflection.java b/src/com/massivecraft/mcore/store/accessor/PropertySetterFieldReflection.java similarity index 84% rename from src/com/massivecraft/mcore5/store/accessor/PropertySetterFieldReflection.java rename to src/com/massivecraft/mcore/store/accessor/PropertySetterFieldReflection.java index 73ca1e12..cf535095 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertySetterFieldReflection.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertySetterFieldReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore5/store/accessor/PropertySetterMethodReflection.java b/src/com/massivecraft/mcore/store/accessor/PropertySetterMethodReflection.java similarity index 85% rename from src/com/massivecraft/mcore5/store/accessor/PropertySetterMethodReflection.java rename to src/com/massivecraft/mcore/store/accessor/PropertySetterMethodReflection.java index 1ee4610d..df74c547 100644 --- a/src/com/massivecraft/mcore5/store/accessor/PropertySetterMethodReflection.java +++ b/src/com/massivecraft/mcore/store/accessor/PropertySetterMethodReflection.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.accessor; +package com.massivecraft.mcore.store.accessor; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategy.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategy.java similarity index 85% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategy.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategy.java index 6ae79964..93266a73 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategy.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategy.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; -import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore.store.CollInterface; /** * The tasks of the IdStrategy: diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAbstract.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyAbstract.java similarity index 86% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAbstract.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategyAbstract.java index 75e38909..ec645331 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAbstract.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyAbstract.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; import java.util.Collection; -import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore.store.CollInterface; public abstract class IdStrategyAbstract, R> implements IdStrategy { diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiGson.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyAiGson.java similarity index 86% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiGson.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategyAiGson.java index 2f2aab49..6ce3672e 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiGson.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyAiGson.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; import java.io.File; import java.io.IOException; -import com.massivecraft.mcore5.store.CollInterface; -import com.massivecraft.mcore5.store.DbGson; -import com.massivecraft.mcore5.util.DiscUtil; +import com.massivecraft.mcore.store.CollInterface; +import com.massivecraft.mcore.store.DbGson; +import com.massivecraft.mcore.util.DiscUtil; public class IdStrategyAiGson extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiMongo.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyAiMongo.java similarity index 84% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiMongo.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategyAiMongo.java index 7607181e..6dc13dd9 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyAiMongo.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyAiMongo.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; -import com.massivecraft.mcore5.store.CollInterface; -import com.massivecraft.mcore5.store.DbMongo; -import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore5.xlib.mongodb.DBCollection; -import com.massivecraft.mcore5.xlib.mongodb.DBObject; +import com.massivecraft.mcore.store.CollInterface; +import com.massivecraft.mcore.store.DbMongo; +import com.massivecraft.mcore.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore.xlib.mongodb.DBCollection; +import com.massivecraft.mcore.xlib.mongodb.DBObject; public class IdStrategyAiMongo extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidGson.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java similarity index 83% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidGson.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java index 6284446f..e11e7088 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidGson.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; -import com.massivecraft.mcore5.store.CollInterface; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.store.CollInterface; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; public class IdStrategyOidGson extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidMongo.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java similarity index 82% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidMongo.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java index 8672762e..2bb44d23 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyOidMongo.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; -import com.massivecraft.mcore5.store.CollInterface; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.store.CollInterface; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; public class IdStrategyOidMongo extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyUuidMongoAndGson.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java similarity index 87% rename from src/com/massivecraft/mcore5/store/idstrategy/IdStrategyUuidMongoAndGson.java rename to src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java index bef2104c..8d74e890 100644 --- a/src/com/massivecraft/mcore5/store/idstrategy/IdStrategyUuidMongoAndGson.java +++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.store.idstrategy; +package com.massivecraft.mcore.store.idstrategy; import java.util.UUID; -import com.massivecraft.mcore5.store.CollInterface; +import com.massivecraft.mcore.store.CollInterface; public class IdStrategyUuidMongoAndGson extends IdStrategyAbstract { diff --git a/src/com/massivecraft/mcore5/store/storeadapter/MongoGsonConverter.java b/src/com/massivecraft/mcore/store/storeadapter/MongoGsonConverter.java similarity index 84% rename from src/com/massivecraft/mcore5/store/storeadapter/MongoGsonConverter.java rename to src/com/massivecraft/mcore/store/storeadapter/MongoGsonConverter.java index 7625ed20..e6fd8a3b 100644 --- a/src/com/massivecraft/mcore5/store/storeadapter/MongoGsonConverter.java +++ b/src/com/massivecraft/mcore/store/storeadapter/MongoGsonConverter.java @@ -1,16 +1,16 @@ -package com.massivecraft.mcore5.store.storeadapter; +package com.massivecraft.mcore.store.storeadapter; import java.util.Map.Entry; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; -import com.massivecraft.mcore5.xlib.gson.JsonArray; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonNull; -import com.massivecraft.mcore5.xlib.gson.JsonObject; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.mongodb.BasicDBList; -import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject; -import com.massivecraft.mcore5.xlib.mongodb.DBObject; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.gson.JsonArray; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonNull; +import com.massivecraft.mcore.xlib.gson.JsonObject; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.mongodb.BasicDBList; +import com.massivecraft.mcore.xlib.mongodb.BasicDBObject; +import com.massivecraft.mcore.xlib.mongodb.DBObject; public final class MongoGsonConverter { diff --git a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapter.java b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapter.java similarity index 75% rename from src/com/massivecraft/mcore5/store/storeadapter/StoreAdapter.java rename to src/com/massivecraft/mcore/store/storeadapter/StoreAdapter.java index 61321ae7..b192d638 100644 --- a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapter.java +++ b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapter.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore5.store.storeadapter; +package com.massivecraft.mcore.store.storeadapter; -import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore.store.Coll; public interface StoreAdapter { diff --git a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterAbstract.java b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapterAbstract.java similarity index 81% rename from src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterAbstract.java rename to src/com/massivecraft/mcore/store/storeadapter/StoreAdapterAbstract.java index 6f40ca97..da974652 100644 --- a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterAbstract.java +++ b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapterAbstract.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.store.storeadapter; +package com.massivecraft.mcore.store.storeadapter; public abstract class StoreAdapterAbstract implements StoreAdapter { diff --git a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterGson.java b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapterGson.java similarity index 81% rename from src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterGson.java rename to src/com/massivecraft/mcore/store/storeadapter/StoreAdapterGson.java index ba60a6fb..b79f8da1 100644 --- a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterGson.java +++ b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapterGson.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore5.store.storeadapter; +package com.massivecraft.mcore.store.storeadapter; -import com.massivecraft.mcore5.store.Coll; -import com.massivecraft.mcore5.xlib.gson.JsonElement; +import com.massivecraft.mcore.store.Coll; +import com.massivecraft.mcore.xlib.gson.JsonElement; public class StoreAdapterGson extends StoreAdapterAbstract { diff --git a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterMongo.java b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapterMongo.java similarity index 75% rename from src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterMongo.java rename to src/com/massivecraft/mcore/store/storeadapter/StoreAdapterMongo.java index f8a7d375..e2a6dddf 100644 --- a/src/com/massivecraft/mcore5/store/storeadapter/StoreAdapterMongo.java +++ b/src/com/massivecraft/mcore/store/storeadapter/StoreAdapterMongo.java @@ -1,8 +1,8 @@ -package com.massivecraft.mcore5.store.storeadapter; +package com.massivecraft.mcore.store.storeadapter; -import com.massivecraft.mcore5.store.Coll; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.mongodb.DBObject; +import com.massivecraft.mcore.store.Coll; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.mongodb.DBObject; public class StoreAdapterMongo extends StoreAdapterAbstract { diff --git a/src/com/massivecraft/mcore5/usys/Aspect.java b/src/com/massivecraft/mcore/usys/Aspect.java similarity index 85% rename from src/com/massivecraft/mcore5/usys/Aspect.java rename to src/com/massivecraft/mcore/usys/Aspect.java index 23d954b6..a72a7770 100644 --- a/src/com/massivecraft/mcore5/usys/Aspect.java +++ b/src/com/massivecraft/mcore/usys/Aspect.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.usys; +package com.massivecraft.mcore.usys; import java.util.ArrayList; import java.util.Arrays; @@ -7,9 +7,9 @@ import java.util.Collection; import lombok.Getter; import lombok.Setter; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.store.Entity; -import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.store.Entity; +import com.massivecraft.mcore.xlib.gson.annotations.SerializedName; public class Aspect extends Entity { diff --git a/src/com/massivecraft/mcore5/usys/AspectColl.java b/src/com/massivecraft/mcore/usys/AspectColl.java similarity index 86% rename from src/com/massivecraft/mcore5/usys/AspectColl.java rename to src/com/massivecraft/mcore/usys/AspectColl.java index 45fad77b..e1ae8551 100644 --- a/src/com/massivecraft/mcore5/usys/AspectColl.java +++ b/src/com/massivecraft/mcore/usys/AspectColl.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.usys; +package com.massivecraft.mcore.usys; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.store.Coll; public class AspectColl extends Coll { diff --git a/src/com/massivecraft/mcore5/usys/Multiverse.java b/src/com/massivecraft/mcore/usys/Multiverse.java similarity index 90% rename from src/com/massivecraft/mcore5/usys/Multiverse.java rename to src/com/massivecraft/mcore/usys/Multiverse.java index a3772c02..fb7546b1 100644 --- a/src/com/massivecraft/mcore5/usys/Multiverse.java +++ b/src/com/massivecraft/mcore/usys/Multiverse.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.usys; +package com.massivecraft.mcore.usys; import java.util.HashMap; import java.util.HashSet; @@ -8,10 +8,10 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.cmd.arg.ARUniverse; -import com.massivecraft.mcore5.store.Entity; -import com.massivecraft.mcore5.util.MUtil; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.cmd.arg.ARUniverse; +import com.massivecraft.mcore.store.Entity; +import com.massivecraft.mcore.util.MUtil; public class Multiverse extends Entity { diff --git a/src/com/massivecraft/mcore5/usys/MultiverseColl.java b/src/com/massivecraft/mcore/usys/MultiverseColl.java similarity index 76% rename from src/com/massivecraft/mcore5/usys/MultiverseColl.java rename to src/com/massivecraft/mcore/usys/MultiverseColl.java index c584e6c9..519c1a9f 100644 --- a/src/com/massivecraft/mcore5/usys/MultiverseColl.java +++ b/src/com/massivecraft/mcore/usys/MultiverseColl.java @@ -1,7 +1,7 @@ -package com.massivecraft.mcore5.usys; +package com.massivecraft.mcore.usys; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.store.Coll; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.store.Coll; public class MultiverseColl extends Coll { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsys.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java similarity index 75% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsys.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsys.java index 140aa8e4..841286af 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsys.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Conf; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.HelpCommand; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.Conf; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.HelpCommand; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdUsys extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspect.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java similarity index 75% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspect.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java index d6c2ef46..c71655ef 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspect.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.HelpCommand; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.HelpCommand; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdUsysAspect extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java similarity index 68% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java index 1fb0443b..8b90c59b 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectList.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARInteger; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.usys.AspectColl; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARInteger; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.usys.AspectColl; +import com.massivecraft.mcore.util.Txt; public class CmdUsysAspectList extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectShow.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java similarity index 63% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectShow.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java index 212fb844..e36d5323 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectShow.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARAspect; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARAspect; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.util.Txt; public class CmdUsysAspectShow extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectUse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java similarity index 62% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectUse.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java index 3016bbd9..e76f5b59 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysAspectUse.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java @@ -1,12 +1,12 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARAspect; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARAspect; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.usys.Multiverse; public class CmdUsysAspectUse extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java similarity index 79% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverse.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java index cc887062..81cb15cf 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverse.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.HelpCommand; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.HelpCommand; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdUsysMultiverse extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseDel.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java similarity index 65% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseDel.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java index abd35fa5..c2627e58 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseDel.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Multiverse; public class CmdUsysMultiverseDel extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java similarity index 69% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java index 90720199..978cdec0 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java @@ -1,15 +1,15 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARInteger; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Multiverse; -import com.massivecraft.mcore5.usys.MultiverseColl; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARInteger; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Multiverse; +import com.massivecraft.mcore.usys.MultiverseColl; +import com.massivecraft.mcore.util.Txt; public class CmdUsysMultiverseList extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseNew.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java similarity index 68% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseNew.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java index 3e6e154d..659bdacd 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseNew.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.MultiverseColl; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.MultiverseColl; public class CmdUsysMultiverseNew extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseShow.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java similarity index 76% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseShow.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java index 1c776b75..1ae3d2e0 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseShow.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java @@ -1,16 +1,16 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; import java.util.ArrayList; import java.util.List; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Aspect; -import com.massivecraft.mcore5.usys.Multiverse; -import com.massivecraft.mcore5.util.Txt; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Aspect; +import com.massivecraft.mcore.usys.Multiverse; +import com.massivecraft.mcore.util.Txt; public class CmdUsysMultiverseShow extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java similarity index 76% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverse.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java index 88f7e406..b2bbbab7 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverse.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.HelpCommand; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.HelpCommand; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdUsysUniverse extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseClear.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java similarity index 73% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseClear.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java index 86182714..19307c3f 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseClear.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Multiverse; public class CmdUsysUniverseClear extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseDel.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java similarity index 74% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseDel.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java index 4705718a..2bf9765b 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseDel.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java @@ -1,11 +1,11 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Multiverse; public class CmdUsysUniverseDel extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseNew.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java similarity index 72% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseNew.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java index d5a41962..4c0a7bbf 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysUniverseNew.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Multiverse; public class CmdUsysUniverseNew extends MCommand { diff --git a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysWorld.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java similarity index 79% rename from src/com/massivecraft/mcore5/usys/cmd/CmdUsysWorld.java rename to src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java index 956f1914..3a3c66ff 100644 --- a/src/com/massivecraft/mcore5/usys/cmd/CmdUsysWorld.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java @@ -1,10 +1,10 @@ -package com.massivecraft.mcore5.usys.cmd; +package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore5.Permission; -import com.massivecraft.mcore5.cmd.MCommand; -import com.massivecraft.mcore5.cmd.arg.ARMultiverse; -import com.massivecraft.mcore5.cmd.req.ReqHasPerm; -import com.massivecraft.mcore5.usys.Multiverse; +import com.massivecraft.mcore.Permission; +import com.massivecraft.mcore.cmd.MCommand; +import com.massivecraft.mcore.cmd.arg.ARMultiverse; +import com.massivecraft.mcore.cmd.req.ReqHasPerm; +import com.massivecraft.mcore.usys.Multiverse; public class CmdUsysWorld extends MCommand { diff --git a/src/com/massivecraft/mcore5/util/BiomeUtil.java b/src/com/massivecraft/mcore/util/BiomeUtil.java similarity index 94% rename from src/com/massivecraft/mcore5/util/BiomeUtil.java rename to src/com/massivecraft/mcore/util/BiomeUtil.java index f01c8b19..850f7279 100644 --- a/src/com/massivecraft/mcore5/util/BiomeUtil.java +++ b/src/com/massivecraft/mcore/util/BiomeUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java similarity index 91% rename from src/com/massivecraft/mcore5/util/BukkitCommandUtil.java rename to src/com/massivecraft/mcore/util/BukkitCommandUtil.java index a8e54b89..03ff971b 100644 --- a/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java +++ b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.lang.reflect.Field; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/util/ClassLoadHack.java b/src/com/massivecraft/mcore/util/ClassLoadHack.java similarity index 91% rename from src/com/massivecraft/mcore5/util/ClassLoadHack.java rename to src/com/massivecraft/mcore/util/ClassLoadHack.java index 92a2155a..84f43a67 100644 --- a/src/com/massivecraft/mcore5/util/ClassLoadHack.java +++ b/src/com/massivecraft/mcore/util/ClassLoadHack.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.io.File; import java.lang.reflect.Method; diff --git a/src/com/massivecraft/mcore5/util/DiscUtil.java b/src/com/massivecraft/mcore/util/DiscUtil.java similarity index 94% rename from src/com/massivecraft/mcore5/util/DiscUtil.java rename to src/com/massivecraft/mcore/util/DiscUtil.java index 887ee5c5..6e53a966 100644 --- a/src/com/massivecraft/mcore5/util/DiscUtil.java +++ b/src/com/massivecraft/mcore/util/DiscUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.io.*; import java.net.URL; diff --git a/src/com/massivecraft/mcore5/util/EventUtil.java b/src/com/massivecraft/mcore/util/EventUtil.java similarity index 95% rename from src/com/massivecraft/mcore5/util/EventUtil.java rename to src/com/massivecraft/mcore/util/EventUtil.java index 733182ab..682df166 100644 --- a/src/com/massivecraft/mcore5/util/EventUtil.java +++ b/src/com/massivecraft/mcore/util/EventUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.lang.reflect.Field; import java.util.logging.Level; diff --git a/src/com/massivecraft/mcore5/util/IntervalUtil.java b/src/com/massivecraft/mcore/util/IntervalUtil.java similarity index 93% rename from src/com/massivecraft/mcore5/util/IntervalUtil.java rename to src/com/massivecraft/mcore/util/IntervalUtil.java index ce7dfc70..a85dedf6 100644 --- a/src/com/massivecraft/mcore5/util/IntervalUtil.java +++ b/src/com/massivecraft/mcore/util/IntervalUtil.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore.MCore; public class IntervalUtil { diff --git a/src/com/massivecraft/mcore5/util/InventoryUtil.java b/src/com/massivecraft/mcore/util/InventoryUtil.java similarity index 90% rename from src/com/massivecraft/mcore5/util/InventoryUtil.java rename to src/com/massivecraft/mcore/util/InventoryUtil.java index 37d91be4..758eef5e 100644 --- a/src/com/massivecraft/mcore5/util/InventoryUtil.java +++ b/src/com/massivecraft/mcore/util/InventoryUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; diff --git a/src/com/massivecraft/mcore5/util/LibLoader.java b/src/com/massivecraft/mcore/util/LibLoader.java similarity index 83% rename from src/com/massivecraft/mcore5/util/LibLoader.java rename to src/com/massivecraft/mcore/util/LibLoader.java index 0ee06429..91709913 100644 --- a/src/com/massivecraft/mcore5/util/LibLoader.java +++ b/src/com/massivecraft/mcore/util/LibLoader.java @@ -1,9 +1,9 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.io.File; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.MPlugin; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.MPlugin; public class LibLoader { diff --git a/src/com/massivecraft/mcore5/util/LightUtil.java b/src/com/massivecraft/mcore/util/LightUtil.java similarity index 92% rename from src/com/massivecraft/mcore5/util/LightUtil.java rename to src/com/massivecraft/mcore/util/LightUtil.java index 7432e067..abbffeca 100644 --- a/src/com/massivecraft/mcore5/util/LightUtil.java +++ b/src/com/massivecraft/mcore/util/LightUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import net.minecraft.server.v1_4_R1.WorldServer; diff --git a/src/com/massivecraft/mcore5/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java similarity index 93% rename from src/com/massivecraft/mcore5/util/MUtil.java rename to src/com/massivecraft/mcore/util/MUtil.java index 25504ac1..d4cc57b1 100644 --- a/src/com/massivecraft/mcore5/util/MUtil.java +++ b/src/com/massivecraft/mcore/util/MUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.io.File; import java.util.ArrayList; @@ -41,15 +41,15 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.ItemStack; -import com.massivecraft.mcore5.InternalListener; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.util.extractor.Extractor; -import com.massivecraft.mcore5.util.extractor.ExtractorPlayer; -import com.massivecraft.mcore5.util.extractor.ExtractorPlayerName; -import com.massivecraft.mcore5.util.extractor.ExtractorSender; -import com.massivecraft.mcore5.util.extractor.ExtractorSenderId; -import com.massivecraft.mcore5.util.extractor.ExtractorWorld; -import com.massivecraft.mcore5.util.extractor.ExtractorWorldName; +import com.massivecraft.mcore.InternalListener; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.util.extractor.Extractor; +import com.massivecraft.mcore.util.extractor.ExtractorPlayer; +import com.massivecraft.mcore.util.extractor.ExtractorPlayerName; +import com.massivecraft.mcore.util.extractor.ExtractorSender; +import com.massivecraft.mcore.util.extractor.ExtractorSenderId; +import com.massivecraft.mcore.util.extractor.ExtractorWorld; +import com.massivecraft.mcore.util.extractor.ExtractorWorldName; public class MUtil { diff --git a/src/com/massivecraft/mcore5/util/PermUtil.java b/src/com/massivecraft/mcore/util/PermUtil.java similarity index 95% rename from src/com/massivecraft/mcore5/util/PermUtil.java rename to src/com/massivecraft/mcore/util/PermUtil.java index d091bfa2..7b94a629 100644 --- a/src/com/massivecraft/mcore5/util/PermUtil.java +++ b/src/com/massivecraft/mcore/util/PermUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.Map; import java.util.Map.Entry; @@ -9,8 +9,8 @@ import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; -import com.massivecraft.mcore5.Lang; -import com.massivecraft.mcore5.MCore; +import com.massivecraft.mcore.Lang; +import com.massivecraft.mcore.MCore; public class PermUtil { diff --git a/src/com/massivecraft/mcore5/util/PlayerUtil.java b/src/com/massivecraft/mcore/util/PlayerUtil.java similarity index 96% rename from src/com/massivecraft/mcore5/util/PlayerUtil.java rename to src/com/massivecraft/mcore/util/PlayerUtil.java index ff26c278..30f8a5b8 100644 --- a/src/com/massivecraft/mcore5/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore/util/PlayerUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.io.File; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/util/PotionPaketUtil.java b/src/com/massivecraft/mcore/util/PotionPaketUtil.java similarity index 95% rename from src/com/massivecraft/mcore5/util/PotionPaketUtil.java rename to src/com/massivecraft/mcore/util/PotionPaketUtil.java index 6fe1ff8a..bad34798 100644 --- a/src/com/massivecraft/mcore5/util/PotionPaketUtil.java +++ b/src/com/massivecraft/mcore/util/PotionPaketUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import net.minecraft.server.v1_4_R1.Packet41MobEffect; import net.minecraft.server.v1_4_R1.Packet42RemoveMobEffect; diff --git a/src/com/massivecraft/mcore5/util/SenderUtil.java b/src/com/massivecraft/mcore/util/SenderUtil.java similarity index 93% rename from src/com/massivecraft/mcore5/util/SenderUtil.java rename to src/com/massivecraft/mcore/util/SenderUtil.java index dd3a0902..ec7095c8 100644 --- a/src/com/massivecraft/mcore5/util/SenderUtil.java +++ b/src/com/massivecraft/mcore/util/SenderUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.ArrayList; import java.util.Arrays; @@ -20,10 +20,10 @@ import org.bukkit.command.RemoteConsoleCommandSender; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.entity.Player; -import com.massivecraft.mcore5.MCore; -import com.massivecraft.mcore5.event.MCoreSenderRegisterEvent; -import com.massivecraft.mcore5.event.MCoreSenderUnregisterEvent; -import com.massivecraft.mcore5.sender.FakeBlockCommandSender; +import com.massivecraft.mcore.MCore; +import com.massivecraft.mcore.event.MCoreSenderRegisterEvent; +import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent; +import com.massivecraft.mcore.sender.FakeBlockCommandSender; /** * We add an ID <--> CommandSender lookup feature. diff --git a/src/com/massivecraft/mcore5/util/SmokeUtil.java b/src/com/massivecraft/mcore/util/SmokeUtil.java similarity index 94% rename from src/com/massivecraft/mcore5/util/SmokeUtil.java rename to src/com/massivecraft/mcore/util/SmokeUtil.java index 7d3ec6e0..b8a6886e 100644 --- a/src/com/massivecraft/mcore5/util/SmokeUtil.java +++ b/src/com/massivecraft/mcore/util/SmokeUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.Collection; import java.util.Random; diff --git a/src/com/massivecraft/mcore5/util/TextWrapper.java b/src/com/massivecraft/mcore/util/TextWrapper.java similarity index 95% rename from src/com/massivecraft/mcore5/util/TextWrapper.java rename to src/com/massivecraft/mcore/util/TextWrapper.java index 2ccca0f7..e0ed7f92 100644 --- a/src/com/massivecraft/mcore5/util/TextWrapper.java +++ b/src/com/massivecraft/mcore/util/TextWrapper.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; // This is a modified version of: https://github.com/Bukkit/CraftBukkit/blob/dbd06b46f2bb6a0be4f93642fe0bf57d97d8feb4/src/main/java/org/bukkit/craftbukkit/TextWrapper.java public class TextWrapper diff --git a/src/com/massivecraft/mcore5/util/ThrownPotionUtil.java b/src/com/massivecraft/mcore/util/ThrownPotionUtil.java similarity index 87% rename from src/com/massivecraft/mcore5/util/ThrownPotionUtil.java rename to src/com/massivecraft/mcore/util/ThrownPotionUtil.java index 238abcda..6ef831c7 100644 --- a/src/com/massivecraft/mcore5/util/ThrownPotionUtil.java +++ b/src/com/massivecraft/mcore/util/ThrownPotionUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftThrownPotion; import org.bukkit.entity.ThrownPotion; diff --git a/src/com/massivecraft/mcore5/util/TimeDiffUtil.java b/src/com/massivecraft/mcore/util/TimeDiffUtil.java similarity index 96% rename from src/com/massivecraft/mcore5/util/TimeDiffUtil.java rename to src/com/massivecraft/mcore/util/TimeDiffUtil.java index eb5b5bd4..a9bf2735 100644 --- a/src/com/massivecraft/mcore5/util/TimeDiffUtil.java +++ b/src/com/massivecraft/mcore/util/TimeDiffUtil.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/com/massivecraft/mcore5/util/TimeUnit.java b/src/com/massivecraft/mcore/util/TimeUnit.java similarity index 96% rename from src/com/massivecraft/mcore5/util/TimeUnit.java rename to src/com/massivecraft/mcore/util/TimeUnit.java index 48f86a26..76540c1b 100644 --- a/src/com/massivecraft/mcore5/util/TimeUnit.java +++ b/src/com/massivecraft/mcore/util/TimeUnit.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/massivecraft/mcore5/util/Txt.java b/src/com/massivecraft/mcore/util/Txt.java similarity index 96% rename from src/com/massivecraft/mcore5/util/Txt.java rename to src/com/massivecraft/mcore/util/Txt.java index e5b5e467..6dd38848 100644 --- a/src/com/massivecraft/mcore5/util/Txt.java +++ b/src/com/massivecraft/mcore/util/Txt.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util; +package com.massivecraft.mcore.util; import java.util.*; import java.util.AbstractMap.SimpleEntry; diff --git a/src/com/massivecraft/mcore5/util/extractor/Extractor.java b/src/com/massivecraft/mcore/util/extractor/Extractor.java similarity index 55% rename from src/com/massivecraft/mcore5/util/extractor/Extractor.java rename to src/com/massivecraft/mcore/util/extractor/Extractor.java index 58fb48d0..0f486360 100644 --- a/src/com/massivecraft/mcore5/util/extractor/Extractor.java +++ b/src/com/massivecraft/mcore/util/extractor/Extractor.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public interface Extractor { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorLogic.java b/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java similarity index 95% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorLogic.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java index 0c7f339c..d92d4bb8 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorLogic.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; import org.bukkit.Location; import org.bukkit.World; @@ -25,9 +25,9 @@ import org.bukkit.event.vehicle.VehicleEnterEvent; import org.bukkit.event.vehicle.VehicleEvent; import org.bukkit.event.vehicle.VehicleExitEvent; -import com.massivecraft.mcore5.PS; -import com.massivecraft.mcore5.store.SenderEntity; -import com.massivecraft.mcore5.util.SenderUtil; +import com.massivecraft.mcore.PS; +import com.massivecraft.mcore.store.SenderEntity; +import com.massivecraft.mcore.util.SenderUtil; public class ExtractorLogic { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayer.java b/src/com/massivecraft/mcore/util/extractor/ExtractorPlayer.java similarity index 85% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorPlayer.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorPlayer.java index 5dffff07..5b5f8665 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayer.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorPlayer.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public class ExtractorPlayer implements Extractor { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayerName.java b/src/com/massivecraft/mcore/util/extractor/ExtractorPlayerName.java similarity index 85% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorPlayerName.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorPlayerName.java index 179c6e4a..fa681b2d 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorPlayerName.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorPlayerName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public class ExtractorPlayerName implements Extractor { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorSender.java b/src/com/massivecraft/mcore/util/extractor/ExtractorSender.java similarity index 85% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorSender.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorSender.java index 7ad942e7..072ea8e3 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorSender.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorSender.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public class ExtractorSender implements Extractor { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorSenderId.java b/src/com/massivecraft/mcore/util/extractor/ExtractorSenderId.java similarity index 85% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorSenderId.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorSenderId.java index 9fbdab70..396738a5 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorSenderId.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorSenderId.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public class ExtractorSenderId implements Extractor { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorWorld.java b/src/com/massivecraft/mcore/util/extractor/ExtractorWorld.java similarity index 85% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorWorld.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorWorld.java index 78788fda..4f39bd95 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorWorld.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorWorld.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public class ExtractorWorld implements Extractor { diff --git a/src/com/massivecraft/mcore5/util/extractor/ExtractorWorldName.java b/src/com/massivecraft/mcore/util/extractor/ExtractorWorldName.java similarity index 85% rename from src/com/massivecraft/mcore5/util/extractor/ExtractorWorldName.java rename to src/com/massivecraft/mcore/util/extractor/ExtractorWorldName.java index 37594f6c..de1dc8f0 100644 --- a/src/com/massivecraft/mcore5/util/extractor/ExtractorWorldName.java +++ b/src/com/massivecraft/mcore/util/extractor/ExtractorWorldName.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.util.extractor; +package com.massivecraft.mcore.util.extractor; public class ExtractorWorldName implements Extractor { diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSON.java b/src/com/massivecraft/mcore/xlib/bson/BSON.java similarity index 99% rename from src/com/massivecraft/mcore5/xlib/bson/BSON.java rename to src/com/massivecraft/mcore/xlib/bson/BSON.java index ec4daa2c..900ef9c2 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSON.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSON.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; import java.nio.charset.Charset; import java.util.HashMap; @@ -26,7 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import java.util.regex.Pattern; -import com.massivecraft.mcore5.xlib.bson.util.ClassMap; +import com.massivecraft.mcore.xlib.bson.util.ClassMap; public class BSON { diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSONCallback.java b/src/com/massivecraft/mcore/xlib/bson/BSONCallback.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/BSONCallback.java rename to src/com/massivecraft/mcore/xlib/bson/BSONCallback.java index b1920c07..79af97f3 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSONCallback.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSONCallback.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; public interface BSONCallback { diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSONDecoder.java b/src/com/massivecraft/mcore/xlib/bson/BSONDecoder.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/BSONDecoder.java rename to src/com/massivecraft/mcore/xlib/bson/BSONDecoder.java index 6d3ba0fe..d2050006 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSONDecoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSONDecoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSONEncoder.java b/src/com/massivecraft/mcore/xlib/bson/BSONEncoder.java similarity index 89% rename from src/com/massivecraft/mcore5/xlib/bson/BSONEncoder.java rename to src/com/massivecraft/mcore/xlib/bson/BSONEncoder.java index 83b93a58..5454a3e2 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSONEncoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSONEncoder.java @@ -11,9 +11,9 @@ * specific language governing permissions and limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.io.*; +import com.massivecraft.mcore.xlib.bson.io.*; public interface BSONEncoder { diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSONException.java b/src/com/massivecraft/mcore/xlib/bson/BSONException.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/BSONException.java rename to src/com/massivecraft/mcore/xlib/bson/BSONException.java index b879ce4e..5adcc178 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSONException.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSONException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; /** * A general runtime exception raised in BSON processing. diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSONLazyDecoder.java b/src/com/massivecraft/mcore/xlib/bson/BSONLazyDecoder.java similarity index 94% rename from src/com/massivecraft/mcore5/xlib/bson/BSONLazyDecoder.java rename to src/com/massivecraft/mcore/xlib/bson/BSONLazyDecoder.java index fdc9c3d3..6d3bb8d9 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSONLazyDecoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSONLazyDecoder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; /** * diff --git a/src/com/massivecraft/mcore5/xlib/bson/BSONObject.java b/src/com/massivecraft/mcore/xlib/bson/BSONObject.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/BSONObject.java rename to src/com/massivecraft/mcore/xlib/bson/BSONObject.java index 1c144f7e..a1c52bef 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BSONObject.java +++ b/src/com/massivecraft/mcore/xlib/bson/BSONObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; import java.util.Map; import java.util.Set; diff --git a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONCallback.java b/src/com/massivecraft/mcore/xlib/bson/BasicBSONCallback.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/BasicBSONCallback.java rename to src/com/massivecraft/mcore/xlib/bson/BasicBSONCallback.java index 33fca848..bdecd29d 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONCallback.java +++ b/src/com/massivecraft/mcore/xlib/bson/BasicBSONCallback.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; import java.util.*; import java.util.regex.Pattern; -import com.massivecraft.mcore5.xlib.bson.types.*; +import com.massivecraft.mcore.xlib.bson.types.*; public class BasicBSONCallback implements BSONCallback { diff --git a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONDecoder.java b/src/com/massivecraft/mcore/xlib/bson/BasicBSONDecoder.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/BasicBSONDecoder.java rename to src/com/massivecraft/mcore/xlib/bson/BasicBSONDecoder.java index 5513e2c7..f143cf5a 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONDecoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/BasicBSONDecoder.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import static com.massivecraft.mcore5.xlib.bson.BSON.*; +import static com.massivecraft.mcore.xlib.bson.BSON.*; import java.io.*; -import com.massivecraft.mcore5.xlib.bson.io.PoolOutputBuffer; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.bson.io.PoolOutputBuffer; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; /** @@ -337,17 +337,17 @@ public class BasicBSONDecoder implements BSONDecoder { public int readInt() throws IOException { - return com.massivecraft.mcore5.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) ); + return com.massivecraft.mcore.xlib.bson.io.Bits.readInt( _inputBuffer , _need(4) ); } public int readIntBE() throws IOException { - return com.massivecraft.mcore5.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) ); + return com.massivecraft.mcore.xlib.bson.io.Bits.readIntBE( _inputBuffer , _need(4) ); } public long readLong() throws IOException { - return com.massivecraft.mcore5.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) ); + return com.massivecraft.mcore.xlib.bson.io.Bits.readLong( _inputBuffer , _need(8) ); } public double readDouble() diff --git a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONEncoder.java b/src/com/massivecraft/mcore/xlib/bson/BasicBSONEncoder.java similarity index 86% rename from src/com/massivecraft/mcore5/xlib/bson/BasicBSONEncoder.java rename to src/com/massivecraft/mcore/xlib/bson/BasicBSONEncoder.java index 005cfad0..b226655d 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONEncoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/BasicBSONEncoder.java @@ -16,32 +16,32 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import static com.massivecraft.mcore5.xlib.bson.BSON.ARRAY; -import static com.massivecraft.mcore5.xlib.bson.BSON.BINARY; -import static com.massivecraft.mcore5.xlib.bson.BSON.BOOLEAN; -import static com.massivecraft.mcore5.xlib.bson.BSON.B_BINARY; -import static com.massivecraft.mcore5.xlib.bson.BSON.B_GENERAL; -import static com.massivecraft.mcore5.xlib.bson.BSON.B_UUID; -import static com.massivecraft.mcore5.xlib.bson.BSON.CODE; -import static com.massivecraft.mcore5.xlib.bson.BSON.CODE_W_SCOPE; -import static com.massivecraft.mcore5.xlib.bson.BSON.DATE; -import static com.massivecraft.mcore5.xlib.bson.BSON.EOO; -import static com.massivecraft.mcore5.xlib.bson.BSON.MAXKEY; -import static com.massivecraft.mcore5.xlib.bson.BSON.MINKEY; -import static com.massivecraft.mcore5.xlib.bson.BSON.NULL; -import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER; -import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_INT; -import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_LONG; -import static com.massivecraft.mcore5.xlib.bson.BSON.OBJECT; -import static com.massivecraft.mcore5.xlib.bson.BSON.OID; -import static com.massivecraft.mcore5.xlib.bson.BSON.REGEX; -import static com.massivecraft.mcore5.xlib.bson.BSON.STRING; -import static com.massivecraft.mcore5.xlib.bson.BSON.SYMBOL; -import static com.massivecraft.mcore5.xlib.bson.BSON.TIMESTAMP; -import static com.massivecraft.mcore5.xlib.bson.BSON.UNDEFINED; -import static com.massivecraft.mcore5.xlib.bson.BSON.regexFlags; +import static com.massivecraft.mcore.xlib.bson.BSON.ARRAY; +import static com.massivecraft.mcore.xlib.bson.BSON.BINARY; +import static com.massivecraft.mcore.xlib.bson.BSON.BOOLEAN; +import static com.massivecraft.mcore.xlib.bson.BSON.B_BINARY; +import static com.massivecraft.mcore.xlib.bson.BSON.B_GENERAL; +import static com.massivecraft.mcore.xlib.bson.BSON.B_UUID; +import static com.massivecraft.mcore.xlib.bson.BSON.CODE; +import static com.massivecraft.mcore.xlib.bson.BSON.CODE_W_SCOPE; +import static com.massivecraft.mcore.xlib.bson.BSON.DATE; +import static com.massivecraft.mcore.xlib.bson.BSON.EOO; +import static com.massivecraft.mcore.xlib.bson.BSON.MAXKEY; +import static com.massivecraft.mcore.xlib.bson.BSON.MINKEY; +import static com.massivecraft.mcore.xlib.bson.BSON.NULL; +import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER; +import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_INT; +import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_LONG; +import static com.massivecraft.mcore.xlib.bson.BSON.OBJECT; +import static com.massivecraft.mcore.xlib.bson.BSON.OID; +import static com.massivecraft.mcore.xlib.bson.BSON.REGEX; +import static com.massivecraft.mcore.xlib.bson.BSON.STRING; +import static com.massivecraft.mcore.xlib.bson.BSON.SYMBOL; +import static com.massivecraft.mcore.xlib.bson.BSON.TIMESTAMP; +import static com.massivecraft.mcore.xlib.bson.BSON.UNDEFINED; +import static com.massivecraft.mcore.xlib.bson.BSON.regexFlags; import java.lang.reflect.Array; import java.nio.Buffer; @@ -56,17 +56,17 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; -import com.massivecraft.mcore5.xlib.bson.io.BasicOutputBuffer; -import com.massivecraft.mcore5.xlib.bson.io.OutputBuffer; -import com.massivecraft.mcore5.xlib.bson.types.BSONTimestamp; -import com.massivecraft.mcore5.xlib.bson.types.Binary; -import com.massivecraft.mcore5.xlib.bson.types.Code; -import com.massivecraft.mcore5.xlib.bson.types.CodeWScope; -import com.massivecraft.mcore5.xlib.bson.types.MaxKey; -import com.massivecraft.mcore5.xlib.bson.types.MinKey; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; -import com.massivecraft.mcore5.xlib.bson.types.Symbol; -import com.massivecraft.mcore5.xlib.mongodb.DBRefBase; +import com.massivecraft.mcore.xlib.bson.io.BasicOutputBuffer; +import com.massivecraft.mcore.xlib.bson.io.OutputBuffer; +import com.massivecraft.mcore.xlib.bson.types.BSONTimestamp; +import com.massivecraft.mcore.xlib.bson.types.Binary; +import com.massivecraft.mcore.xlib.bson.types.Code; +import com.massivecraft.mcore.xlib.bson.types.CodeWScope; +import com.massivecraft.mcore.xlib.bson.types.MaxKey; +import com.massivecraft.mcore.xlib.bson.types.MinKey; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.bson.types.Symbol; +import com.massivecraft.mcore.xlib.mongodb.DBRefBase; /** * this is meant to be pooled or cached @@ -401,7 +401,7 @@ public class BasicBSONEncoder implements BSONEncoder { int before = _buf.getPosition(); _buf.write( data ); int after = _buf.getPosition(); - com.massivecraft.mcore5.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length ); + com.massivecraft.mcore.xlib.mongodb.util.MyAsserts.assertEquals( after - before , data.length ); } protected void putUUID( String name , UUID val ){ diff --git a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONObject.java b/src/com/massivecraft/mcore/xlib/bson/BasicBSONObject.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/BasicBSONObject.java rename to src/com/massivecraft/mcore/xlib/bson/BasicBSONObject.java index 83dac16a..e6ef4de0 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/BasicBSONObject.java +++ b/src/com/massivecraft/mcore/xlib/bson/BasicBSONObject.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; // BSON -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; // Java import java.util.Map; @@ -310,7 +310,7 @@ public class BasicBSONObject extends LinkedHashMap implements BSO * @return JSON serialization */ public String toString(){ - return com.massivecraft.mcore5.xlib.mongodb.util.JSON.serialize( this ); + return com.massivecraft.mcore.xlib.mongodb.util.JSON.serialize( this ); } public boolean equals( Object o ){ diff --git a/src/com/massivecraft/mcore5/xlib/bson/EmptyBSONCallback.java b/src/com/massivecraft/mcore/xlib/bson/EmptyBSONCallback.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/EmptyBSONCallback.java rename to src/com/massivecraft/mcore/xlib/bson/EmptyBSONCallback.java index 91e92b31..f5f2826a 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/EmptyBSONCallback.java +++ b/src/com/massivecraft/mcore/xlib/bson/EmptyBSONCallback.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; public class EmptyBSONCallback implements BSONCallback { diff --git a/src/com/massivecraft/mcore5/xlib/bson/KeyCachingLazyBSONObject.java b/src/com/massivecraft/mcore/xlib/bson/KeyCachingLazyBSONObject.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/KeyCachingLazyBSONObject.java rename to src/com/massivecraft/mcore/xlib/bson/KeyCachingLazyBSONObject.java index 8af64ce5..ecd9b7f4 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/KeyCachingLazyBSONObject.java +++ b/src/com/massivecraft/mcore/xlib/bson/KeyCachingLazyBSONObject.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; import java.util.HashMap; -import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; /** * @author brendan diff --git a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONCallback.java b/src/com/massivecraft/mcore/xlib/bson/LazyBSONCallback.java similarity index 93% rename from src/com/massivecraft/mcore5/xlib/bson/LazyBSONCallback.java rename to src/com/massivecraft/mcore/xlib/bson/LazyBSONCallback.java index 38b1016b..040dfd24 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONCallback.java +++ b/src/com/massivecraft/mcore/xlib/bson/LazyBSONCallback.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; import java.util.List; import java.util.logging.Logger; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; -import com.massivecraft.mcore5.xlib.mongodb.LazyDBObject; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.mongodb.LazyDBObject; /** diff --git a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONDecoder.java b/src/com/massivecraft/mcore/xlib/bson/LazyBSONDecoder.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/LazyBSONDecoder.java rename to src/com/massivecraft/mcore/xlib/bson/LazyBSONDecoder.java index 546c0895..5857f768 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONDecoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/LazyBSONDecoder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.io.Bits; +import com.massivecraft.mcore.xlib.bson.io.Bits; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONList.java b/src/com/massivecraft/mcore/xlib/bson/LazyBSONList.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/LazyBSONList.java rename to src/com/massivecraft/mcore/xlib/bson/LazyBSONList.java index 793efa23..583de43b 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONList.java +++ b/src/com/massivecraft/mcore/xlib/bson/LazyBSONList.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; import java.util.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONObject.java b/src/com/massivecraft/mcore/xlib/bson/LazyBSONObject.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/LazyBSONObject.java rename to src/com/massivecraft/mcore/xlib/bson/LazyBSONObject.java index c1763e5e..53483f76 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/LazyBSONObject.java +++ b/src/com/massivecraft/mcore/xlib/bson/LazyBSONObject.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; -import com.massivecraft.mcore5.xlib.bson.types.*; +import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore.xlib.bson.types.*; import java.io.IOException; import java.io.OutputStream; @@ -670,7 +670,7 @@ public class LazyBSONObject implements BSONObject { * @return JSON serialization */ public String toString(){ - return com.massivecraft.mcore5.xlib.mongodb.util.JSON.serialize( this ); + return com.massivecraft.mcore.xlib.mongodb.util.JSON.serialize( this ); } /** diff --git a/src/com/massivecraft/mcore5/xlib/bson/LazyDBList.java b/src/com/massivecraft/mcore/xlib/bson/LazyDBList.java similarity index 82% rename from src/com/massivecraft/mcore5/xlib/bson/LazyDBList.java rename to src/com/massivecraft/mcore/xlib/bson/LazyDBList.java index 340acd8b..ecfde15e 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/LazyDBList.java +++ b/src/com/massivecraft/mcore/xlib/bson/LazyDBList.java @@ -1,12 +1,12 @@ /** * */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer; -import com.massivecraft.mcore5.xlib.mongodb.DBObject; -import com.massivecraft.mcore5.xlib.mongodb.util.JSON; +import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer; +import com.massivecraft.mcore.xlib.mongodb.DBObject; +import com.massivecraft.mcore.xlib.mongodb.util.JSON; /** * @author scotthernandez diff --git a/src/com/massivecraft/mcore5/xlib/bson/NewBSONDecoder.java b/src/com/massivecraft/mcore/xlib/bson/NewBSONDecoder.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/NewBSONDecoder.java rename to src/com/massivecraft/mcore/xlib/bson/NewBSONDecoder.java index 2ea23368..d71887d8 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/NewBSONDecoder.java +++ b/src/com/massivecraft/mcore/xlib/bson/NewBSONDecoder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; -import com.massivecraft.mcore5.xlib.bson.io.Bits; -import com.massivecraft.mcore5.xlib.bson.types.ObjectId; +import com.massivecraft.mcore.xlib.bson.io.Bits; +import com.massivecraft.mcore.xlib.bson.types.ObjectId; -import static com.massivecraft.mcore5.xlib.bson.BSON.*; +import static com.massivecraft.mcore.xlib.bson.BSON.*; // Java import java.io.IOException; diff --git a/src/com/massivecraft/mcore5/xlib/bson/Transformer.java b/src/com/massivecraft/mcore/xlib/bson/Transformer.java similarity index 94% rename from src/com/massivecraft/mcore5/xlib/bson/Transformer.java rename to src/com/massivecraft/mcore/xlib/bson/Transformer.java index 5051f40a..25de8aac 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/Transformer.java +++ b/src/com/massivecraft/mcore/xlib/bson/Transformer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson; +package com.massivecraft.mcore.xlib.bson; public interface Transformer { diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/BSONByteBuffer.java b/src/com/massivecraft/mcore/xlib/bson/io/BSONByteBuffer.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/io/BSONByteBuffer.java rename to src/com/massivecraft/mcore/xlib/bson/io/BSONByteBuffer.java index 3847d425..f12e0cfb 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/io/BSONByteBuffer.java +++ b/src/com/massivecraft/mcore/xlib/bson/io/BSONByteBuffer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.io; +package com.massivecraft.mcore.xlib.bson.io; -import com.massivecraft.mcore5.xlib.bson.*; +import com.massivecraft.mcore.xlib.bson.*; import java.io.*; import java.nio.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/BasicOutputBuffer.java b/src/com/massivecraft/mcore/xlib/bson/io/BasicOutputBuffer.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/io/BasicOutputBuffer.java rename to src/com/massivecraft/mcore/xlib/bson/io/BasicOutputBuffer.java index b28af84c..c9028a6e 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/io/BasicOutputBuffer.java +++ b/src/com/massivecraft/mcore/xlib/bson/io/BasicOutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.io; +package com.massivecraft.mcore.xlib.bson.io; import java.io.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/Bits.java b/src/com/massivecraft/mcore/xlib/bson/io/Bits.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/io/Bits.java rename to src/com/massivecraft/mcore/xlib/bson/io/Bits.java index b98a73a9..c97be2e5 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/io/Bits.java +++ b/src/com/massivecraft/mcore/xlib/bson/io/Bits.java @@ -17,7 +17,7 @@ */ -package com.massivecraft.mcore5.xlib.bson.io; +package com.massivecraft.mcore.xlib.bson.io; import java.io.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/OutputBuffer.java b/src/com/massivecraft/mcore/xlib/bson/io/OutputBuffer.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/io/OutputBuffer.java rename to src/com/massivecraft/mcore/xlib/bson/io/OutputBuffer.java index d3791a3b..41605424 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/io/OutputBuffer.java +++ b/src/com/massivecraft/mcore/xlib/bson/io/OutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.io; +package com.massivecraft.mcore.xlib.bson.io; import java.io.*; import java.security.*; @@ -114,7 +114,7 @@ public abstract class OutputBuffer extends OutputStream { throw new RuntimeException( "impossible" ); } - return com.massivecraft.mcore5.xlib.mongodb.util.Util.toHex( md5.digest() ); + return com.massivecraft.mcore.xlib.mongodb.util.Util.toHex( md5.digest() ); } public void writeInt( int x ){ diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/PoolOutputBuffer.java b/src/com/massivecraft/mcore/xlib/bson/io/PoolOutputBuffer.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/io/PoolOutputBuffer.java rename to src/com/massivecraft/mcore/xlib/bson/io/PoolOutputBuffer.java index 2e41fc2d..947349ee 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/io/PoolOutputBuffer.java +++ b/src/com/massivecraft/mcore/xlib/bson/io/PoolOutputBuffer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.io; +package com.massivecraft.mcore.xlib.bson.io; import java.io.*; @@ -228,8 +228,8 @@ public class PoolOutputBuffer extends OutputBuffer { private final Position _cur = new Position(); private final Position _end = new Position(); - private static com.massivecraft.mcore5.xlib.bson.util.SimplePool _extra = - new com.massivecraft.mcore5.xlib.bson.util.SimplePool( ( 1024 * 1024 * 10 ) / BUF_SIZE ){ + private static com.massivecraft.mcore.xlib.bson.util.SimplePool _extra = + new com.massivecraft.mcore.xlib.bson.util.SimplePool( ( 1024 * 1024 * 10 ) / BUF_SIZE ){ protected byte[] createNew(){ return new byte[BUF_SIZE]; diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/UTF8Encoding.java b/src/com/massivecraft/mcore/xlib/bson/io/UTF8Encoding.java similarity index 99% rename from src/com/massivecraft/mcore5/xlib/bson/io/UTF8Encoding.java rename to src/com/massivecraft/mcore/xlib/bson/io/UTF8Encoding.java index 4c151228..89742d24 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/io/UTF8Encoding.java +++ b/src/com/massivecraft/mcore/xlib/bson/io/UTF8Encoding.java @@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE. */ //package org.postgresql.core; -package com.massivecraft.mcore5.xlib.bson.io; +package com.massivecraft.mcore.xlib.bson.io; import java.io.IOException; import java.text.MessageFormat; diff --git a/src/com/massivecraft/mcore5/xlib/bson/io/package.html b/src/com/massivecraft/mcore/xlib/bson/io/package.html similarity index 100% rename from src/com/massivecraft/mcore5/xlib/bson/io/package.html rename to src/com/massivecraft/mcore/xlib/bson/io/package.html diff --git a/src/com/massivecraft/mcore5/xlib/bson/package.html b/src/com/massivecraft/mcore/xlib/bson/package.html similarity index 100% rename from src/com/massivecraft/mcore5/xlib/bson/package.html rename to src/com/massivecraft/mcore/xlib/bson/package.html diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/BSONTimestamp.java b/src/com/massivecraft/mcore/xlib/bson/types/BSONTimestamp.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/types/BSONTimestamp.java rename to src/com/massivecraft/mcore/xlib/bson/types/BSONTimestamp.java index c104d3e7..f1e1184b 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/BSONTimestamp.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/BSONTimestamp.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; import java.io.Serializable; import java.util.Date; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/BasicBSONList.java b/src/com/massivecraft/mcore/xlib/bson/types/BasicBSONList.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/types/BasicBSONList.java rename to src/com/massivecraft/mcore/xlib/bson/types/BasicBSONList.java index bc858cac..06c42931 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/BasicBSONList.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/BasicBSONList.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; -import com.massivecraft.mcore5.xlib.bson.*; -import com.massivecraft.mcore5.xlib.bson.util.StringRangeSet; +import com.massivecraft.mcore.xlib.bson.*; +import com.massivecraft.mcore.xlib.bson.util.StringRangeSet; import java.util.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/Binary.java b/src/com/massivecraft/mcore/xlib/bson/types/Binary.java similarity index 94% rename from src/com/massivecraft/mcore5/xlib/bson/types/Binary.java rename to src/com/massivecraft/mcore/xlib/bson/types/Binary.java index 9c532c18..b8ca01f0 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/Binary.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/Binary.java @@ -19,9 +19,9 @@ * under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; -import com.massivecraft.mcore5.xlib.bson.BSON; +import com.massivecraft.mcore.xlib.bson.BSON; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/Code.java b/src/com/massivecraft/mcore/xlib/bson/types/Code.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/types/Code.java rename to src/com/massivecraft/mcore/xlib/bson/types/Code.java index ef8a745f..5ee86c94 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/Code.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/Code.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/CodeWScope.java b/src/com/massivecraft/mcore/xlib/bson/types/CodeWScope.java similarity index 93% rename from src/com/massivecraft/mcore5/xlib/bson/types/CodeWScope.java rename to src/com/massivecraft/mcore/xlib/bson/types/CodeWScope.java index 3e091b26..cd6047f1 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/CodeWScope.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/CodeWScope.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; -import com.massivecraft.mcore5.xlib.bson.*; +import com.massivecraft.mcore.xlib.bson.*; /** * for using the CodeWScope type diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/MaxKey.java b/src/com/massivecraft/mcore/xlib/bson/types/MaxKey.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/types/MaxKey.java rename to src/com/massivecraft/mcore/xlib/bson/types/MaxKey.java index fc1b7a7b..fbe9a7c4 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/MaxKey.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/MaxKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/MinKey.java b/src/com/massivecraft/mcore/xlib/bson/types/MinKey.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/types/MinKey.java rename to src/com/massivecraft/mcore/xlib/bson/types/MinKey.java index d84b1453..b18bfa0f 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/MinKey.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/MinKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/ObjectId.java b/src/com/massivecraft/mcore/xlib/bson/types/ObjectId.java similarity index 99% rename from src/com/massivecraft/mcore5/xlib/bson/types/ObjectId.java rename to src/com/massivecraft/mcore/xlib/bson/types/ObjectId.java index f9bdd241..d7390121 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/ObjectId.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/ObjectId.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; import java.net.*; import java.nio.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/Symbol.java b/src/com/massivecraft/mcore/xlib/bson/types/Symbol.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/types/Symbol.java rename to src/com/massivecraft/mcore/xlib/bson/types/Symbol.java index b452683b..9357d701 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/types/Symbol.java +++ b/src/com/massivecraft/mcore/xlib/bson/types/Symbol.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.types; +package com.massivecraft.mcore.xlib.bson.types; import java.io.Serializable; diff --git a/src/com/massivecraft/mcore5/xlib/bson/types/package.html b/src/com/massivecraft/mcore/xlib/bson/types/package.html similarity index 100% rename from src/com/massivecraft/mcore5/xlib/bson/types/package.html rename to src/com/massivecraft/mcore/xlib/bson/types/package.html diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/AbstractCopyOnWriteMap.java b/src/com/massivecraft/mcore/xlib/bson/util/AbstractCopyOnWriteMap.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/util/AbstractCopyOnWriteMap.java rename to src/com/massivecraft/mcore/xlib/bson/util/AbstractCopyOnWriteMap.java index cb6fd23a..8eeb2aca 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/AbstractCopyOnWriteMap.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/AbstractCopyOnWriteMap.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; -import static com.massivecraft.mcore5.xlib.bson.util.Assertions.notNull; +import static com.massivecraft.mcore.xlib.bson.util.Assertions.notNull; import static java.util.Collections.unmodifiableCollection; import static java.util.Collections.unmodifiableSet; -import com.massivecraft.mcore5.xlib.bson.util.annotations.GuardedBy; -import com.massivecraft.mcore5.xlib.bson.util.annotations.ThreadSafe; +import com.massivecraft.mcore.xlib.bson.util.annotations.GuardedBy; +import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe; import java.io.Serializable; import java.util.Collection; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/Assertions.java b/src/com/massivecraft/mcore/xlib/bson/util/Assertions.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/util/Assertions.java rename to src/com/massivecraft/mcore/xlib/bson/util/Assertions.java index 56354e0c..727c993d 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/Assertions.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/Assertions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; /** * Design by contract assertions. diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/ClassAncestry.java b/src/com/massivecraft/mcore/xlib/bson/util/ClassAncestry.java similarity index 94% rename from src/com/massivecraft/mcore5/xlib/bson/util/ClassAncestry.java rename to src/com/massivecraft/mcore/xlib/bson/util/ClassAncestry.java index ecec76b5..272c2620 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/ClassAncestry.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/ClassAncestry.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; -import static com.massivecraft.mcore5.xlib.bson.util.CopyOnWriteMap.newHashMap; +import static com.massivecraft.mcore.xlib.bson.util.CopyOnWriteMap.newHashMap; import static java.util.Collections.unmodifiableList; import java.util.ArrayList; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/ClassMap.java b/src/com/massivecraft/mcore/xlib/bson/util/ClassMap.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/util/ClassMap.java rename to src/com/massivecraft/mcore/xlib/bson/util/ClassMap.java index 666eb268..e0367c3c 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/ClassMap.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/ClassMap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; import java.util.List; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/ComputingMap.java b/src/com/massivecraft/mcore/xlib/bson/util/ComputingMap.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/util/ComputingMap.java rename to src/com/massivecraft/mcore/xlib/bson/util/ComputingMap.java index 8511ab71..8954ce00 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/ComputingMap.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/ComputingMap.java @@ -1,6 +1,6 @@ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; -import static com.massivecraft.mcore5.xlib.bson.util.Assertions.notNull; +import static com.massivecraft.mcore.xlib.bson.util.Assertions.notNull; import java.util.Collection; import java.util.Map; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/CopyOnWriteMap.java b/src/com/massivecraft/mcore/xlib/bson/util/CopyOnWriteMap.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/bson/util/CopyOnWriteMap.java rename to src/com/massivecraft/mcore/xlib/bson/util/CopyOnWriteMap.java index 9745a477..6dd42466 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/CopyOnWriteMap.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/CopyOnWriteMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; import java.util.Collections; import java.util.HashMap; @@ -24,9 +24,9 @@ import java.util.TreeMap; import java.util.WeakHashMap; -import com.massivecraft.mcore5.xlib.bson.util.AbstractCopyOnWriteMap.View.Type; -import com.massivecraft.mcore5.xlib.bson.util.annotations.GuardedBy; -import com.massivecraft.mcore5.xlib.bson.util.annotations.ThreadSafe; +import com.massivecraft.mcore.xlib.bson.util.AbstractCopyOnWriteMap.View.Type; +import com.massivecraft.mcore.xlib.bson.util.annotations.GuardedBy; +import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe; /** * A thread-safe variant of {@link Map} in which all mutative operations (the diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/Function.java b/src/com/massivecraft/mcore/xlib/bson/util/Function.java similarity index 50% rename from src/com/massivecraft/mcore5/xlib/bson/util/Function.java rename to src/com/massivecraft/mcore/xlib/bson/util/Function.java index 1ee242a8..f78f35a6 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/Function.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/Function.java @@ -1,4 +1,4 @@ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; interface Function { B apply(A a); diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/SimplePool.java b/src/com/massivecraft/mcore/xlib/bson/util/SimplePool.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/util/SimplePool.java rename to src/com/massivecraft/mcore/xlib/bson/util/SimplePool.java index 40964772..2dae4776 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/SimplePool.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/SimplePool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; import java.util.*; import java.util.concurrent.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/StringRangeSet.java b/src/com/massivecraft/mcore/xlib/bson/util/StringRangeSet.java similarity index 98% rename from src/com/massivecraft/mcore5/xlib/bson/util/StringRangeSet.java rename to src/com/massivecraft/mcore/xlib/bson/util/StringRangeSet.java index 25b7a298..4bc6d646 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/StringRangeSet.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/StringRangeSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.massivecraft.mcore5.xlib.bson.util; +package com.massivecraft.mcore.xlib.bson.util; import java.util.Collection; import java.util.Iterator; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/GuardedBy.java b/src/com/massivecraft/mcore/xlib/bson/util/annotations/GuardedBy.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/bson/util/annotations/GuardedBy.java rename to src/com/massivecraft/mcore/xlib/bson/util/annotations/GuardedBy.java index c34cdb9d..66fde85b 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/GuardedBy.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/annotations/GuardedBy.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore5.xlib.bson.util.annotations; +package com.massivecraft.mcore.xlib.bson.util.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/Immutable.java b/src/com/massivecraft/mcore/xlib/bson/util/annotations/Immutable.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/bson/util/annotations/Immutable.java rename to src/com/massivecraft/mcore/xlib/bson/util/annotations/Immutable.java index 9a509087..12ac413a 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/Immutable.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/annotations/Immutable.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore5.xlib.bson.util.annotations; +package com.massivecraft.mcore.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/NotThreadSafe.java b/src/com/massivecraft/mcore/xlib/bson/util/annotations/NotThreadSafe.java similarity index 93% rename from src/com/massivecraft/mcore5/xlib/bson/util/annotations/NotThreadSafe.java rename to src/com/massivecraft/mcore/xlib/bson/util/annotations/NotThreadSafe.java index 4fe141d2..b41ed388 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/NotThreadSafe.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/annotations/NotThreadSafe.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore5.xlib.bson.util.annotations; +package com.massivecraft.mcore.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/ThreadSafe.java b/src/com/massivecraft/mcore/xlib/bson/util/annotations/ThreadSafe.java similarity index 93% rename from src/com/massivecraft/mcore5/xlib/bson/util/annotations/ThreadSafe.java rename to src/com/massivecraft/mcore/xlib/bson/util/annotations/ThreadSafe.java index ed2e2dd8..970a5e20 100644 --- a/src/com/massivecraft/mcore5/xlib/bson/util/annotations/ThreadSafe.java +++ b/src/com/massivecraft/mcore/xlib/bson/util/annotations/ThreadSafe.java @@ -8,7 +8,7 @@ * must include this copyright and license notice. */ -package com.massivecraft.mcore5.xlib.bson.util.annotations; +package com.massivecraft.mcore.xlib.bson.util.annotations; import java.lang.annotation.*; diff --git a/src/com/massivecraft/mcore5/xlib/bson/util/package.html b/src/com/massivecraft/mcore/xlib/bson/util/package.html similarity index 100% rename from src/com/massivecraft/mcore5/xlib/bson/util/package.html rename to src/com/massivecraft/mcore/xlib/bson/util/package.html diff --git a/src/com/massivecraft/mcore5/xlib/gson/DefaultDateTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/DefaultDateTypeAdapter.java similarity index 87% rename from src/com/massivecraft/mcore5/xlib/gson/DefaultDateTypeAdapter.java rename to src/com/massivecraft/mcore/xlib/gson/DefaultDateTypeAdapter.java index 6d40ad90..b4d4cefe 100644 --- a/src/com/massivecraft/mcore5/xlib/gson/DefaultDateTypeAdapter.java +++ b/src/com/massivecraft/mcore/xlib/gson/DefaultDateTypeAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.gson; +package com.massivecraft.mcore.xlib.gson; import java.lang.reflect.Type; import java.sql.Timestamp; @@ -25,15 +25,15 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import com.massivecraft.mcore5.xlib.gson.DefaultDateTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonPrimitive; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; -import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException; +import com.massivecraft.mcore.xlib.gson.DefaultDateTypeAdapter; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonPrimitive; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.gson.JsonSyntaxException; /** * This type adapter supports three subclasses of date: Date, Timestamp, and diff --git a/src/com/massivecraft/mcore5/xlib/gson/ExclusionStrategy.java b/src/com/massivecraft/mcore/xlib/gson/ExclusionStrategy.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/gson/ExclusionStrategy.java rename to src/com/massivecraft/mcore/xlib/gson/ExclusionStrategy.java index a2a025bd..97e0707b 100644 --- a/src/com/massivecraft/mcore5/xlib/gson/ExclusionStrategy.java +++ b/src/com/massivecraft/mcore/xlib/gson/ExclusionStrategy.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.gson; +package com.massivecraft.mcore.xlib.gson; -import com.massivecraft.mcore5.xlib.gson.ExclusionStrategy; -import com.massivecraft.mcore5.xlib.gson.FieldAttributes; -import com.massivecraft.mcore5.xlib.gson.GsonBuilder; +import com.massivecraft.mcore.xlib.gson.ExclusionStrategy; +import com.massivecraft.mcore.xlib.gson.FieldAttributes; +import com.massivecraft.mcore.xlib.gson.GsonBuilder; /** * A strategy (or policy) definition that is used to decide whether or not a field or top-level diff --git a/src/com/massivecraft/mcore5/xlib/gson/FieldAttributes.java b/src/com/massivecraft/mcore/xlib/gson/FieldAttributes.java similarity index 97% rename from src/com/massivecraft/mcore5/xlib/gson/FieldAttributes.java rename to src/com/massivecraft/mcore/xlib/gson/FieldAttributes.java index 0f8d87b4..cb0085ae 100644 --- a/src/com/massivecraft/mcore5/xlib/gson/FieldAttributes.java +++ b/src/com/massivecraft/mcore/xlib/gson/FieldAttributes.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.gson; +package com.massivecraft.mcore.xlib.gson; -import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions; +import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore5/xlib/gson/FieldNamingPolicy.java b/src/com/massivecraft/mcore/xlib/gson/FieldNamingPolicy.java similarity index 95% rename from src/com/massivecraft/mcore5/xlib/gson/FieldNamingPolicy.java rename to src/com/massivecraft/mcore/xlib/gson/FieldNamingPolicy.java index 9d8095a2..837cf0b1 100644 --- a/src/com/massivecraft/mcore5/xlib/gson/FieldNamingPolicy.java +++ b/src/com/massivecraft/mcore/xlib/gson/FieldNamingPolicy.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.gson; +package com.massivecraft.mcore.xlib.gson; import java.lang.reflect.Field; -import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy; +import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy; /** * An enumeration that defines a few standard naming conventions for JSON field names. - * This enumeration should be used in conjunction with {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} - * to configure a {@link com.massivecraft.mcore5.xlib.gson.Gson} instance to properly translate Java field + * This enumeration should be used in conjunction with {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} + * to configure a {@link com.massivecraft.mcore.xlib.gson.Gson} instance to properly translate Java field * names into the desired JSON field names. * * @author Inderjeet Singh diff --git a/src/com/massivecraft/mcore5/xlib/gson/FieldNamingStrategy.java b/src/com/massivecraft/mcore/xlib/gson/FieldNamingStrategy.java similarity index 96% rename from src/com/massivecraft/mcore5/xlib/gson/FieldNamingStrategy.java rename to src/com/massivecraft/mcore/xlib/gson/FieldNamingStrategy.java index b6dacf72..e3942d8a 100644 --- a/src/com/massivecraft/mcore5/xlib/gson/FieldNamingStrategy.java +++ b/src/com/massivecraft/mcore/xlib/gson/FieldNamingStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.gson; +package com.massivecraft.mcore.xlib.gson; import java.lang.reflect.Field; diff --git a/src/com/massivecraft/mcore5/xlib/gson/Gson.java b/src/com/massivecraft/mcore/xlib/gson/Gson.java similarity index 91% rename from src/com/massivecraft/mcore5/xlib/gson/Gson.java rename to src/com/massivecraft/mcore/xlib/gson/Gson.java index a826c09a..21676e07 100644 --- a/src/com/massivecraft/mcore5/xlib/gson/Gson.java +++ b/src/com/massivecraft/mcore/xlib/gson/Gson.java @@ -14,48 +14,48 @@ * limitations under the License. */ -package com.massivecraft.mcore5.xlib.gson; +package com.massivecraft.mcore.xlib.gson; -import com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy; -import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy; -import com.massivecraft.mcore5.xlib.gson.Gson; -import com.massivecraft.mcore5.xlib.gson.GsonBuilder; -import com.massivecraft.mcore5.xlib.gson.InstanceCreator; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonDeserializer; -import com.massivecraft.mcore5.xlib.gson.JsonElement; -import com.massivecraft.mcore5.xlib.gson.JsonIOException; -import com.massivecraft.mcore5.xlib.gson.JsonNull; -import com.massivecraft.mcore5.xlib.gson.JsonParseException; -import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext; -import com.massivecraft.mcore5.xlib.gson.JsonSerializer; -import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException; -import com.massivecraft.mcore5.xlib.gson.LongSerializationPolicy; -import com.massivecraft.mcore5.xlib.gson.TypeAdapter; -import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory; -import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor; -import com.massivecraft.mcore5.xlib.gson.internal.Excluder; -import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess; -import com.massivecraft.mcore5.xlib.gson.internal.Primitives; -import com.massivecraft.mcore5.xlib.gson.internal.Streams; -import com.massivecraft.mcore5.xlib.gson.internal.bind.ArrayTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.BigDecimalTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.BigIntegerTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.CollectionTypeAdapterFactory; -import com.massivecraft.mcore5.xlib.gson.internal.bind.DateTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeReader; -import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeWriter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.MapTypeAdapterFactory; -import com.massivecraft.mcore5.xlib.gson.internal.bind.ObjectTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory; -import com.massivecraft.mcore5.xlib.gson.internal.bind.SqlDateTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.TimeTypeAdapter; -import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters; -import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken; -import com.massivecraft.mcore5.xlib.gson.stream.JsonReader; -import com.massivecraft.mcore5.xlib.gson.stream.JsonToken; -import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter; -import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException; +import com.massivecraft.mcore.xlib.gson.FieldNamingPolicy; +import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy; +import com.massivecraft.mcore.xlib.gson.Gson; +import com.massivecraft.mcore.xlib.gson.GsonBuilder; +import com.massivecraft.mcore.xlib.gson.InstanceCreator; +import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext; +import com.massivecraft.mcore.xlib.gson.JsonDeserializer; +import com.massivecraft.mcore.xlib.gson.JsonElement; +import com.massivecraft.mcore.xlib.gson.JsonIOException; +import com.massivecraft.mcore.xlib.gson.JsonNull; +import com.massivecraft.mcore.xlib.gson.JsonParseException; +import com.massivecraft.mcore.xlib.gson.JsonSerializationContext; +import com.massivecraft.mcore.xlib.gson.JsonSerializer; +import com.massivecraft.mcore.xlib.gson.JsonSyntaxException; +import com.massivecraft.mcore.xlib.gson.LongSerializationPolicy; +import com.massivecraft.mcore.xlib.gson.TypeAdapter; +import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory; +import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor; +import com.massivecraft.mcore.xlib.gson.internal.Excluder; +import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess; +import com.massivecraft.mcore.xlib.gson.internal.Primitives; +import com.massivecraft.mcore.xlib.gson.internal.Streams; +import com.massivecraft.mcore.xlib.gson.internal.bind.ArrayTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.BigDecimalTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.BigIntegerTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.CollectionTypeAdapterFactory; +import com.massivecraft.mcore.xlib.gson.internal.bind.DateTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeReader; +import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeWriter; +import com.massivecraft.mcore.xlib.gson.internal.bind.MapTypeAdapterFactory; +import com.massivecraft.mcore.xlib.gson.internal.bind.ObjectTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory; +import com.massivecraft.mcore.xlib.gson.internal.bind.SqlDateTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.TimeTypeAdapter; +import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters; +import com.massivecraft.mcore.xlib.gson.reflect.TypeToken; +import com.massivecraft.mcore.xlib.gson.stream.JsonReader; +import com.massivecraft.mcore.xlib.gson.stream.JsonToken; +import com.massivecraft.mcore.xlib.gson.stream.JsonWriter; +import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException; import java.io.EOFException; import java.io.IOException; @@ -109,7 +109,7 @@ import java.util.Map; *

See the Gson User Guide * for a more complete set of examples.

* - * @see com.massivecraft.mcore5.xlib.gson.reflect.TypeToken + * @see com.massivecraft.mcore.xlib.gson.reflect.TypeToken * * @author Inderjeet Singh * @author Joel Leitch @@ -180,10 +180,10 @@ public final class Gson { * ignores the millisecond portion of the date during serialization. You can change * this by invoking {@link GsonBuilder#setDateFormat(int)} or * {@link GsonBuilder#setDateFormat(String)}. - *
  • By default, Gson ignores the {@link com.massivecraft.mcore5.xlib.gson.annotations.Expose} annotation. + *
  • By default, Gson ignores the {@link com.massivecraft.mcore.xlib.gson.annotations.Expose} annotation. * You can enable Gson to serialize/deserialize only those fields marked with this annotation * through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}.
    • - *
  • By default, Gson ignores the {@link com.massivecraft.mcore5.xlib.gson.annotations.Since} annotation. You + *
  • By default, Gson ignores the {@link com.massivecraft.mcore.xlib.gson.annotations.Since} annotation. You * can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.
    • *
  • The default field naming policy for the output Json is same as in Java. So, a Java class * field versionNumber will be output as "versionNumber@quot; in @@ -444,7 +444,7 @@ public final class Gson { * * @param src the object for which JSON representation is to be created * @param typeOfSrc The specific genericized type of src. You can obtain - * this type by using the {@link com.massivecraft.mcore5.xlib.gson.reflect.TypeToken} class. For example, + * this type by using the {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, * to get the type for {@code Collection}, you should use: * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -486,7 +486,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore5.xlib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -528,7 +528,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore5.xlib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -670,7 +670,7 @@ public final class Gson {
    * @param  the type of the desired object
    * @param json the string from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore5.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -723,7 +723,7 @@ public final class Gson {
    * @param  the type of the desired object
    * @param json the reader producing Json from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore5.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -820,7 +820,7 @@ public final class Gson {
    * @param json the root of the parse tree of {@link JsonElement}s from which the object is to
    * be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore5.xlib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore.xlib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
diff --git a/src/com/massivecraft/mcore5/xlib/gson/GsonBuilder.java b/src/com/massivecraft/mcore/xlib/gson/GsonBuilder.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/gson/GsonBuilder.java
rename to src/com/massivecraft/mcore/xlib/gson/GsonBuilder.java
index 69d66f47..8cc1b902 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/GsonBuilder.java
+++ b/src/com/massivecraft/mcore/xlib/gson/GsonBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
@@ -26,25 +26,25 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.massivecraft.mcore5.xlib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.ExclusionStrategy;
-import com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore5.xlib.gson.InstanceCreator;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore5.xlib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore5.xlib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore5.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore5.xlib.gson.internal.Primitives;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.DefaultDateTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.ExclusionStrategy;
+import com.massivecraft.mcore.xlib.gson.FieldNamingPolicy;
+import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore.xlib.gson.InstanceCreator;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.LongSerializationPolicy;
+import com.massivecraft.mcore.xlib.gson.TreeTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore.xlib.gson.internal.Excluder;
+import com.massivecraft.mcore.xlib.gson.internal.Primitives;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
 
 /**
  * 
    Use this builder to construct a {@link Gson} instance when you need to set configuration
@@ -152,7 +152,7 @@ public final class GsonBuilder {
 
   /**
    * Configures Gson to exclude all fields from consideration for serialization or deserialization
-   * that do not have the {@link com.massivecraft.mcore5.xlib.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.mcore.xlib.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/com/massivecraft/mcore5/xlib/gson/InstanceCreator.java b/src/com/massivecraft/mcore/xlib/gson/InstanceCreator.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/InstanceCreator.java
rename to src/com/massivecraft/mcore/xlib/gson/InstanceCreator.java
index 120462f4..fe5e2d63 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/InstanceCreator.java
+++ b/src/com/massivecraft/mcore/xlib/gson/InstanceCreator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore.xlib.gson.GsonBuilder;
 
 /**
  * This interface is implemented to create instances of a class that does not define a no-args
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonArray.java b/src/com/massivecraft/mcore/xlib/gson/JsonArray.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonArray.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonArray.java
index ea6d92d6..0f9d7d3e 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonArray.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -22,10 +22,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
 
 /**
  * A class representing an array type in Json. An array is a list of {@link JsonElement}s each of
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializationContext.java b/src/com/massivecraft/mcore/xlib/gson/JsonDeserializationContext.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonDeserializationContext.java
index 64f16db5..21539ab7 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonDeserializationContext.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
 
 /**
  * Context for deserialization that is passed to a custom deserializer during invocation of its
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializer.java b/src/com/massivecraft/mcore/xlib/gson/JsonDeserializer.java
similarity index 91%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonDeserializer.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonDeserializer.java
index b10350d4..d0dacc07 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonDeserializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
 
 /**
  * 
    Interface representing a custom deserializer for Json. You should write a custom
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonElement.java b/src/com/massivecraft/mcore/xlib/gson/JsonElement.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonElement.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonElement.java
index 91869c00..646d2622 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonElement.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonElement.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.internal.Streams;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.internal.Streams;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonIOException.java b/src/com/massivecraft/mcore/xlib/gson/JsonIOException.java
similarity index 92%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonIOException.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonIOException.java
index 41ec7930..4e8082e7 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonIOException.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonIOException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonNull.java b/src/com/massivecraft/mcore/xlib/gson/JsonNull.java
similarity index 87%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonNull.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonNull.java
index 00025bde..fa3b58a6 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonNull.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonNull.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
 
 /**
  * A class representing a Json {@code null} value.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonObject.java b/src/com/massivecraft/mcore/xlib/gson/JsonObject.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonObject.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonObject.java
index b7674271..03859a54 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonObject.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonObject.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonParseException.java b/src/com/massivecraft/mcore/xlib/gson/JsonParseException.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonParseException.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonParseException.java
index 92ed97da..8f81423b 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonParseException.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonParseException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonParser.java b/src/com/massivecraft/mcore/xlib/gson/JsonParser.java
similarity index 81%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonParser.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonParser.java
index c523f0c7..88b1fec8 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonParser.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonParser.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonIOException;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.internal.Streams;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonIOException;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.internal.Streams;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonPrimitive.java b/src/com/massivecraft/mcore/xlib/gson/JsonPrimitive.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonPrimitive.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonPrimitive.java
index 7325b876..3447752f 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonPrimitive.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonPrimitive.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore5.xlib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonSerializationContext.java b/src/com/massivecraft/mcore/xlib/gson/JsonSerializationContext.java
similarity index 89%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonSerializationContext.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonSerializationContext.java
index fbffc82d..a9dd404b 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonSerializationContext.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
 
 /**
  * Context for serialization that is passed to a custom serializer during invocation of its
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonSerializer.java b/src/com/massivecraft/mcore/xlib/gson/JsonSerializer.java
similarity index 90%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonSerializer.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonSerializer.java
index 6d740de0..bea9b938 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonSerializer.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonSerializer.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
 
 /**
  * Interface representing a custom serializer for Json. You should write a custom serializer, if
  * you are not happy with the default serialization done by Gson. You will also need to register
- * this serializer through {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * 
    Let us look at example where defining a serializer will be useful. The {@code Id} class
  * defined below has two fields: {@code clazz} and {@code value}.
    
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonStreamParser.java b/src/com/massivecraft/mcore/xlib/gson/JsonStreamParser.java
similarity index 87%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonStreamParser.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonStreamParser.java
index eafc6382..81736899 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonStreamParser.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonStreamParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,14 +22,14 @@ import java.io.StringReader;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonIOException;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.internal.Streams;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonIOException;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.internal.Streams;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader
diff --git a/src/com/massivecraft/mcore5/xlib/gson/JsonSyntaxException.java b/src/com/massivecraft/mcore/xlib/gson/JsonSyntaxException.java
similarity index 92%
rename from src/com/massivecraft/mcore5/xlib/gson/JsonSyntaxException.java
rename to src/com/massivecraft/mcore/xlib/gson/JsonSyntaxException.java
index 730be537..a69e7a1a 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/JsonSyntaxException.java
+++ b/src/com/massivecraft/mcore/xlib/gson/JsonSyntaxException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/com/massivecraft/mcore5/xlib/gson/LongSerializationPolicy.java b/src/com/massivecraft/mcore/xlib/gson/LongSerializationPolicy.java
similarity index 91%
rename from src/com/massivecraft/mcore5/xlib/gson/LongSerializationPolicy.java
rename to src/com/massivecraft/mcore/xlib/gson/LongSerializationPolicy.java
index 9458d385..542724bb 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/LongSerializationPolicy.java
+++ b/src/com/massivecraft/mcore/xlib/gson/LongSerializationPolicy.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/TreeTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/TreeTypeAdapter.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/gson/TreeTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/TreeTypeAdapter.java
index 210600f9..250602c4 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/TreeTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/TreeTypeAdapter.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore5.xlib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore5.xlib.gson.internal.Streams;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.TreeTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore.xlib.gson.internal.Streams;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore5/xlib/gson/TypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/TypeAdapter.java
similarity index 92%
rename from src/com/massivecraft/mcore5/xlib/gson/TypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/TypeAdapter.java
index 5c69ddcc..ee7a9866 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/TypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/TypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonIOException;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonIOException;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -138,7 +138,7 @@ public abstract class TypeAdapter {
    * Unlike Gson's similar {@link Gson#toJson(JsonElement, Appendable) toJson}
    * method, this write is strict. Create a {@link
    * JsonWriter#setLenient(boolean) lenient} {@code JsonWriter} and call
-   * {@link #write(com.massivecraft.mcore5.xlib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore.xlib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
@@ -211,7 +211,7 @@ public abstract class TypeAdapter {
    * Converts {@code value} to a JSON document. Unlike Gson's similar {@link
    * Gson#toJson(Object) toJson} method, this write is strict. Create a {@link
    * JsonWriter#setLenient(boolean) lenient} {@code JsonWriter} and call
-   * {@link #write(com.massivecraft.mcore5.xlib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore.xlib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/TypeAdapterFactory.java b/src/com/massivecraft/mcore/xlib/gson/TypeAdapterFactory.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/gson/TypeAdapterFactory.java
rename to src/com/massivecraft/mcore/xlib/gson/TypeAdapterFactory.java
index ada197e4..1cb8299a 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/TypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore/xlib/gson/TypeAdapterFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson;
+package com.massivecraft.mcore.xlib.gson;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
 
 /**
  * Creates type adapters for set of related types. Type adapter factories are
@@ -82,7 +82,7 @@ import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
  * mapping from lowercase name to enum value is computed eagerly.
  *
  * 
    As with type adapters, factories must be registered with a {@link
- * com.massivecraft.mcore5.xlib.gson.GsonBuilder} for them to take effect: 
       {@code
+ * com.massivecraft.mcore.xlib.gson.GsonBuilder} for them to take effect: 
       {@code
  *
  *  GsonBuilder builder = new GsonBuilder();
  *  builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
diff --git a/src/com/massivecraft/mcore5/xlib/gson/annotations/Expose.java b/src/com/massivecraft/mcore/xlib/gson/annotations/Expose.java
similarity index 92%
rename from src/com/massivecraft/mcore5/xlib/gson/annotations/Expose.java
rename to src/com/massivecraft/mcore/xlib/gson/annotations/Expose.java
index 6621e890..ecb724a0 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/annotations/Expose.java
+++ b/src/com/massivecraft/mcore/xlib/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.annotations;
+package com.massivecraft.mcore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be exposed for JSON
  * serialization or deserialization.
  *
- * 
    This annotation has no effect unless you build {@link com.massivecraft.mcore5.xlib.gson.Gson}
- * with a {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * 
    This annotation has no effect unless you build {@link com.massivecraft.mcore.xlib.gson.Gson}
+ * with a {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
diff --git a/src/com/massivecraft/mcore5/xlib/gson/annotations/SerializedName.java b/src/com/massivecraft/mcore/xlib/gson/annotations/SerializedName.java
similarity index 86%
rename from src/com/massivecraft/mcore5/xlib/gson/annotations/SerializedName.java
rename to src/com/massivecraft/mcore/xlib/gson/annotations/SerializedName.java
index 22b8f1ff..6afdd34b 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/annotations/SerializedName.java
+++ b/src/com/massivecraft/mcore/xlib/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.annotations;
+package com.massivecraft.mcore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,10 +25,10 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be serialized to JSON with
  * the provided name value as its field name.
  *
- * 
    This annotation will override any {@link com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore5.xlib.gson.Gson}
+ * 
    This annotation will override any {@link com.massivecraft.mcore.xlib.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore.xlib.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore.xlib.gson.FieldNamingPolicy)}
  * for more information.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * 
    NOTE: The value you specify in this annotation must be a valid JSON field name.
    
  *
- * @see com.massivecraft.mcore5.xlib.gson.FieldNamingPolicy
+ * @see com.massivecraft.mcore.xlib.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/com/massivecraft/mcore5/xlib/gson/annotations/Since.java b/src/com/massivecraft/mcore/xlib/gson/annotations/Since.java
similarity index 89%
rename from src/com/massivecraft/mcore5/xlib/gson/annotations/Since.java
rename to src/com/massivecraft/mcore/xlib/gson/annotations/Since.java
index 6c3a0179..15d1010c 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/annotations/Since.java
+++ b/src/com/massivecraft/mcore/xlib/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.annotations;
+package com.massivecraft.mcore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,9 +26,9 @@ import java.lang.annotation.Target;
  * This annotation is useful to manage versioning of your Json classes for a web-service.
  *
  * 
    
- * This annotation has no effect unless you build {@link com.massivecraft.mcore5.xlib.gson.Gson} with a
- * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore.xlib.gson.Gson} with a
+ * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/com/massivecraft/mcore5/xlib/gson/annotations/Until.java b/src/com/massivecraft/mcore/xlib/gson/annotations/Until.java
similarity index 90%
rename from src/com/massivecraft/mcore5/xlib/gson/annotations/Until.java
rename to src/com/massivecraft/mcore/xlib/gson/annotations/Until.java
index b32e7945..45c47cef 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/annotations/Until.java
+++ b/src/com/massivecraft/mcore/xlib/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.annotations;
+package com.massivecraft.mcore.xlib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,9 +28,9 @@ import java.lang.annotation.Target;
  * is useful to manage versioning of your JSON classes for a web-service.
  *
  * 
    
- * This annotation has no effect unless you build {@link com.massivecraft.mcore5.xlib.gson.Gson} with a
- * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore.xlib.gson.Gson} with a
+ * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore.xlib.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/com/massivecraft/mcore5/xlib/gson/annotations/package-info.java b/src/com/massivecraft/mcore/xlib/gson/annotations/package-info.java
similarity index 54%
rename from src/com/massivecraft/mcore5/xlib/gson/annotations/package-info.java
rename to src/com/massivecraft/mcore/xlib/gson/annotations/package-info.java
index ae897a7d..8aed3f73 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/annotations/package-info.java
+++ b/src/com/massivecraft/mcore/xlib/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.massivecraft.mcore5.xlib.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.mcore.xlib.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore5.xlib.gson.annotations;
\ No newline at end of file
+package com.massivecraft.mcore.xlib.gson.annotations;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Preconditions.java
similarity index 92%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Preconditions.java
index dcfb67ed..e93c2139 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
 /**
  * A simple utility class used to check method Preconditions.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Types.java b/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Types.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Types.java
index 207b20de..b554b2d7 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/$Gson$Types.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import static com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions.checkArgument;
-import static com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
+import static com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/mcore/xlib/gson/internal/ConstructorConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/ConstructorConstructor.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/ConstructorConstructor.java
index f887625b..8ca24b1c 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/ConstructorConstructor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import com.massivecraft.mcore5.xlib.gson.InstanceCreator;
-import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.UnsafeAllocator;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.InstanceCreator;
+import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/Excluder.java b/src/com/massivecraft/mcore/xlib/gson/internal/Excluder.java
similarity index 89%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/Excluder.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/Excluder.java
index 9fc841bb..349d2b7d 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/Excluder.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/Excluder.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import com.massivecraft.mcore5.xlib.gson.ExclusionStrategy;
-import com.massivecraft.mcore5.xlib.gson.FieldAttributes;
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.annotations.Expose;
-import com.massivecraft.mcore5.xlib.gson.annotations.Since;
-import com.massivecraft.mcore5.xlib.gson.annotations.Until;
-import com.massivecraft.mcore5.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.ExclusionStrategy;
+import com.massivecraft.mcore.xlib.gson.FieldAttributes;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.annotations.Expose;
+import com.massivecraft.mcore.xlib.gson.annotations.Since;
+import com.massivecraft.mcore.xlib.gson.annotations.Until;
+import com.massivecraft.mcore.xlib.gson.internal.Excluder;
+import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/GsonInternalAccess.java b/src/com/massivecraft/mcore/xlib/gson/internal/GsonInternalAccess.java
similarity index 77%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/GsonInternalAccess.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/GsonInternalAccess.java
index 1880a296..f0129d50 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/GsonInternalAccess.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/GsonInternalAccess.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
 
 /**
  * Internal-only APIs of Gson available only to other classes in Gson.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/JsonReaderInternalAccess.java b/src/com/massivecraft/mcore/xlib/gson/internal/JsonReaderInternalAccess.java
similarity index 84%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/JsonReaderInternalAccess.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/JsonReaderInternalAccess.java
index dfa54f23..1ae830c7 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/JsonReaderInternalAccess.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/JsonReaderInternalAccess.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import com.massivecraft.mcore5.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/LazilyParsedNumber.java b/src/com/massivecraft/mcore/xlib/gson/internal/LazilyParsedNumber.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/LazilyParsedNumber.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/LazilyParsedNumber.java
index 4a3bcc3b..29bc3485 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/LazilyParsedNumber.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/LazilyParsedNumber.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
 import java.math.BigInteger;
 
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/mcore/xlib/gson/internal/ObjectConstructor.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/ObjectConstructor.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/ObjectConstructor.java
index f1abf82e..91794ee2 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
 /**
  * Defines a generic object construction factory.  The purpose of this class
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/Pair.java b/src/com/massivecraft/mcore/xlib/gson/internal/Pair.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/Pair.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/Pair.java
index 9c4e5c4a..08eac0a0 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/Pair.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/Pair.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import com.massivecraft.mcore5.xlib.gson.internal.Pair;
+import com.massivecraft.mcore.xlib.gson.internal.Pair;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/Primitives.java b/src/com/massivecraft/mcore/xlib/gson/internal/Primitives.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/Primitives.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/Primitives.java
index 5d59b44c..7127c3be 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/Primitives.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
 
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/Streams.java b/src/com/massivecraft/mcore/xlib/gson/internal/Streams.java
similarity index 83%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/Streams.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/Streams.java
index 1083e167..840bc082 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/Streams.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/Streams.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonIOException;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
-import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonIOException;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/UnsafeAllocator.java b/src/com/massivecraft/mcore/xlib/gson/internal/UnsafeAllocator.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/UnsafeAllocator.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/UnsafeAllocator.java
index fb5a3b14..6fa45af7 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/UnsafeAllocator.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/UnsafeAllocator.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal;
+package com.massivecraft.mcore.xlib.gson.internal;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import com.massivecraft.mcore5.xlib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore.xlib.gson.internal.UnsafeAllocator;
 
 /**
  * Do sneaky things to allocate objects without invoking their constructors.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/ArrayTypeAdapter.java
similarity index 80%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/ArrayTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/ArrayTypeAdapter.java
index 0f1078ba..250ddd90 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
@@ -23,16 +23,16 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore.xlib.gson.internal.bind.ArrayTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 /**
  * Adapt an array of objects.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigDecimalTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
index 6fd2c40b..6e4778ca 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigDecimalTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigIntegerTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
index 0ce56c45..a361c7d2 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/BigIntegerTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
similarity index 80%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
index fe67b497..af55458b 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/DateTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/DateTypeAdapter.java
similarity index 82%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/DateTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/DateTypeAdapter.java
index d3b2daf3..eb90e853 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/DateTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/DateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.DateTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.bind.DateTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeReader.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeReader.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeReader.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeReader.java
index 9bc8c1c9..20198d75 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeReader.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeWriter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeWriter.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeWriter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeWriter.java
index 99821e8a..dc5c5324 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/JsonTreeWriter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/JsonTreeWriter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
similarity index 88%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/MapTypeAdapterFactory.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
index 83d05c2b..21290314 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonIOException;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.Streams;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonIOException;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.Streams;
+import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/ObjectTypeAdapter.java
similarity index 83%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/ObjectTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/ObjectTypeAdapter.java
index a31ee63c..8b01fc77 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/ObjectTypeAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.ObjectTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.bind.ObjectTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 6f463c08..082e88c3 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore5.xlib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.Excluder;
-import com.massivecraft.mcore5.xlib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore5.xlib.gson.internal.Primitives;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore.xlib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.Excluder;
+import com.massivecraft.mcore.xlib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore.xlib.gson.internal.Primitives;
+import com.massivecraft.mcore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/SqlDateTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
similarity index 77%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/SqlDateTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
index 2c73bca7..1da275a3 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/SqlDateTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/SqlDateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.SqlDateTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.bind.SqlDateTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TimeTypeAdapter.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/TimeTypeAdapter.java
similarity index 77%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/TimeTypeAdapter.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/TimeTypeAdapter.java
index bf7a8826..e022ee57 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TimeTypeAdapter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/TimeTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.TimeTypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.internal.bind.TimeTypeAdapter;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.sql.Time;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
similarity index 84%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index 96a7aeff..83a4d2f5 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapters.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java
index 90cf98e8..ef77b108 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/bind/TypeAdapters.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.internal.bind;
+package com.massivecraft.mcore.xlib.gson.internal.bind;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -32,22 +32,22 @@ import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonIOException;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.JsonSyntaxException;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapter;
-import com.massivecraft.mcore5.xlib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName;
-import com.massivecraft.mcore5.xlib.gson.internal.LazilyParsedNumber;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonIOException;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
+import com.massivecraft.mcore.xlib.gson.TypeAdapter;
+import com.massivecraft.mcore.xlib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
+import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 /**
  * Type adapters for basic types.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/internal/package-info.java b/src/com/massivecraft/mcore/xlib/gson/internal/package-info.java
similarity index 82%
rename from src/com/massivecraft/mcore5/xlib/gson/internal/package-info.java
rename to src/com/massivecraft/mcore/xlib/gson/internal/package-info.java
index 6ec6e546..c937dc07 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/internal/package-info.java
+++ b/src/com/massivecraft/mcore/xlib/gson/internal/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch, Jesse Wilson
  */
-package com.massivecraft.mcore5.xlib.gson.internal;
\ No newline at end of file
+package com.massivecraft.mcore.xlib.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore/xlib/gson/package-info.java b/src/com/massivecraft/mcore/xlib/gson/package-info.java
new file mode 100644
index 00000000..4915276a
--- /dev/null
+++ b/src/com/massivecraft/mcore/xlib/gson/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This package provides the {@link com.massivecraft.mcore.xlib.gson.Gson} class to convert Json to Java and
+ * vice-versa.
+ *
+ * 
    The primary class to use is {@link com.massivecraft.mcore.xlib.gson.Gson} which can be constructed with
+ * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore.xlib.gson.GsonBuilder}
+ * (to configure various options such as using versioning and so on).
    
+ *
+ * @author Inderjeet Singh, Joel Leitch
+ */
+package com.massivecraft.mcore.xlib.gson;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore5/xlib/gson/reflect/TypeToken.java b/src/com/massivecraft/mcore/xlib/gson/reflect/TypeToken.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/reflect/TypeToken.java
rename to src/com/massivecraft/mcore/xlib/gson/reflect/TypeToken.java
index 0e2bb502..517bcccb 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/mcore/xlib/gson/reflect/TypeToken.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.reflect;
+package com.massivecraft.mcore.xlib.gson.reflect;
 
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore5.xlib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore5.xlib.gson.reflect.TypeToken;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore.xlib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/reflect/package-info.java b/src/com/massivecraft/mcore/xlib/gson/reflect/package-info.java
similarity index 73%
rename from src/com/massivecraft/mcore5/xlib/gson/reflect/package-info.java
rename to src/com/massivecraft/mcore/xlib/gson/reflect/package-info.java
index 8d9bb5a7..81c1dffd 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/reflect/package-info.java
+++ b/src/com/massivecraft/mcore/xlib/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore5.xlib.gson.reflect;
\ No newline at end of file
+package com.massivecraft.mcore.xlib.gson.reflect;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonReader.java b/src/com/massivecraft/mcore/xlib/gson/stream/JsonReader.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/gson/stream/JsonReader.java
rename to src/com/massivecraft/mcore/xlib/gson/stream/JsonReader.java
index e947c51a..467ad586 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonReader.java
+++ b/src/com/massivecraft/mcore/xlib/gson/stream/JsonReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.stream;
+package com.massivecraft.mcore.xlib.gson.stream;
 
-import com.massivecraft.mcore5.xlib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore5.xlib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonScope;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonToken;
-import com.massivecraft.mcore5.xlib.gson.stream.MalformedJsonException;
-import com.massivecraft.mcore5.xlib.gson.stream.StringPool;
+import com.massivecraft.mcore.xlib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore.xlib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonScope;
+import com.massivecraft.mcore.xlib.gson.stream.JsonToken;
+import com.massivecraft.mcore.xlib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore.xlib.gson.stream.StringPool;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonScope.java b/src/com/massivecraft/mcore/xlib/gson/stream/JsonScope.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/stream/JsonScope.java
rename to src/com/massivecraft/mcore/xlib/gson/stream/JsonScope.java
index 7d9de65c..9552948d 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonScope.java
+++ b/src/com/massivecraft/mcore/xlib/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.stream;
+package com.massivecraft.mcore.xlib.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonToken.java b/src/com/massivecraft/mcore/xlib/gson/stream/JsonToken.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/stream/JsonToken.java
rename to src/com/massivecraft/mcore/xlib/gson/stream/JsonToken.java
index 2d41a36a..f40c5960 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonToken.java
+++ b/src/com/massivecraft/mcore/xlib/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.stream;
+package com.massivecraft.mcore.xlib.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonWriter.java b/src/com/massivecraft/mcore/xlib/gson/stream/JsonWriter.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/gson/stream/JsonWriter.java
rename to src/com/massivecraft/mcore/xlib/gson/stream/JsonWriter.java
index 0323e7ee..90ded3e2 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/stream/JsonWriter.java
+++ b/src/com/massivecraft/mcore/xlib/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.stream;
+package com.massivecraft.mcore.xlib.gson.stream;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -22,8 +22,8 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore5.xlib.gson.stream.JsonScope;
-import com.massivecraft.mcore5.xlib.gson.stream.JsonWriter;
+import com.massivecraft.mcore.xlib.gson.stream.JsonScope;
+import com.massivecraft.mcore.xlib.gson.stream.JsonWriter;
 
 /**
  * Writes a JSON (RFC 4627)
diff --git a/src/com/massivecraft/mcore5/xlib/gson/stream/MalformedJsonException.java b/src/com/massivecraft/mcore/xlib/gson/stream/MalformedJsonException.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/gson/stream/MalformedJsonException.java
rename to src/com/massivecraft/mcore/xlib/gson/stream/MalformedJsonException.java
index 08579693..b8657e4e 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/stream/MalformedJsonException.java
+++ b/src/com/massivecraft/mcore/xlib/gson/stream/MalformedJsonException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.stream;
+package com.massivecraft.mcore.xlib.gson.stream;
 
 import java.io.IOException;
 
-import com.massivecraft.mcore5.xlib.gson.stream.JsonReader;
+import com.massivecraft.mcore.xlib.gson.stream.JsonReader;
 
 /**
  * Thrown when a reader encounters malformed JSON. Some syntax errors can be
diff --git a/src/com/massivecraft/mcore5/xlib/gson/stream/StringPool.java b/src/com/massivecraft/mcore/xlib/gson/stream/StringPool.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/gson/stream/StringPool.java
rename to src/com/massivecraft/mcore/xlib/gson/stream/StringPool.java
index 3005b341..3423c718 100644
--- a/src/com/massivecraft/mcore5/xlib/gson/stream/StringPool.java
+++ b/src/com/massivecraft/mcore/xlib/gson/stream/StringPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.gson.stream;
+package com.massivecraft.mcore.xlib.gson.stream;
 
 /**
  * A pool of string instances. Unlike the {@link String#intern() VM's
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBList.java b/src/com/massivecraft/mcore/xlib/mongodb/BasicDBList.java
similarity index 91%
rename from src/com/massivecraft/mcore5/xlib/mongodb/BasicDBList.java
rename to src/com/massivecraft/mcore/xlib/mongodb/BasicDBList.java
index eaf5ee8d..189bbd6d 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBList.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/BasicDBList.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 
-import com.massivecraft.mcore5.xlib.bson.types.BasicBSONList;
-import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore.xlib.bson.types.BasicBSONList;
+import com.massivecraft.mcore.xlib.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson list that is mongo specific 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObject.java b/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObject.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObject.java
rename to src/com/massivecraft/mcore/xlib/mongodb/BasicDBObject.java
index d9191383..0a2b5f5a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObject.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObject.java
@@ -16,13 +16,13 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.Map;
 
 
-import com.massivecraft.mcore5.xlib.bson.BasicBSONObject;
-import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore.xlib.bson.BasicBSONObject;
+import com.massivecraft.mcore.xlib.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson object that is mongo specific.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObjectBuilder.java b/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObjectBuilder.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObjectBuilder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/BasicDBObjectBuilder.java
index 73ef8d56..96730d39 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/BasicDBObjectBuilder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/BasicDBObjectBuilder.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/Bytes.java b/src/com/massivecraft/mcore/xlib/mongodb/Bytes.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/Bytes.java
rename to src/com/massivecraft/mcore/xlib/mongodb/Bytes.java
index 8b80e271..9e96d749 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/Bytes.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/Bytes.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -24,11 +24,11 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore5.xlib.bson.BSON;
-import com.massivecraft.mcore5.xlib.bson.types.BSONTimestamp;
-import com.massivecraft.mcore5.xlib.bson.types.Code;
-import com.massivecraft.mcore5.xlib.bson.types.CodeWScope;
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.bson.BSON;
+import com.massivecraft.mcore.xlib.bson.types.BSONTimestamp;
+import com.massivecraft.mcore.xlib.bson.types.Code;
+import com.massivecraft.mcore.xlib.bson.types.CodeWScope;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 
 /**
  * Class that hold definitions of the wire protocol
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/CommandResult.java b/src/com/massivecraft/mcore/xlib/mongodb/CommandResult.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/CommandResult.java
rename to src/com/massivecraft/mcore/xlib/mongodb/CommandResult.java
index cb56f301..9f5d8ec4 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/CommandResult.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/CommandResult.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DB.java b/src/com/massivecraft/mcore/xlib/mongodb/DB.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DB.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DB.java
index 3cbcbd01..981cba7c 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DB.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DB.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,8 +28,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.massivecraft.mcore5.xlib.mongodb.DBApiLayer.Result;
-import com.massivecraft.mcore5.xlib.mongodb.util.Util;
+import com.massivecraft.mcore.xlib.mongodb.DBApiLayer.Result;
+import com.massivecraft.mcore.xlib.mongodb.util.Util;
 
 /**
  * an abstract class that represents a logical database on a server
@@ -133,7 +133,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method calls {@link DB#command(com.massivecraft.mcore5.xlib.mongodb.DBObject, int) } with 0 as query option.
+     * This method calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int) } with 0 as query option.
      * @see List of Commands
      * @param cmd dbobject representing the command to execute
      * @return result of command from the database
@@ -199,7 +199,7 @@ public abstract class DB {
     }
     /**
      * Executes a database command.
-     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore5.xlib.mongodb.DBObject) }
+     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject) }
      * @see List of Commands
      * @param cmd command to execute
      * @return result of command from the database
@@ -212,7 +212,7 @@ public abstract class DB {
 
     /**
      * Executes a database command.
-     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore5.xlib.mongodb.DBObject, int)  }
+     * This method constructs a simple dbobject and calls {@link DB#command(com.massivecraft.mcore.xlib.mongodb.DBObject, int)  }
      * @see List of Commands
      * @param cmd command to execute
      * @param options query options to use
@@ -387,13 +387,13 @@ public abstract class DB {
      * @return
      * @throws MongoException
      */
-    public CommandResult getLastError( com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern )
+    public CommandResult getLastError( com.massivecraft.mcore.xlib.mongodb.WriteConcern concern )
         throws MongoException {
         return command( concern.getCommand() );
     }
 
     /**
-     * @see {@link DB#getLastError(com.massivecraft.mcore5.xlib.mongodb.WriteConcern) }
+     * @see {@link DB#getLastError(com.massivecraft.mcore.xlib.mongodb.WriteConcern) }
      * @param w
      * @param wtimeout
      * @param fsync
@@ -402,7 +402,7 @@ public abstract class DB {
      */
     public CommandResult getLastError( int w , int wtimeout , boolean fsync )
         throws MongoException {
-        return command( (new com.massivecraft.mcore5.xlib.mongodb.WriteConcern( w, wtimeout , fsync )).getCommand() );
+        return command( (new com.massivecraft.mcore.xlib.mongodb.WriteConcern( w, wtimeout , fsync )).getCommand() );
     }
 
 
@@ -412,7 +412,7 @@ public abstract class DB {
      * documentation for {@link WriteConcern} for more information.
      * @param concern write concern to use
      */
-    public void setWriteConcern( com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern ){
+    public void setWriteConcern( com.massivecraft.mcore.xlib.mongodb.WriteConcern concern ){
         if (concern == null) throw new IllegalArgumentException();
         _concern = concern;
     }
@@ -421,7 +421,7 @@ public abstract class DB {
      * Gets the write concern for this database.
      * @return
      */
-    public com.massivecraft.mcore5.xlib.mongodb.WriteConcern getWriteConcern(){
+    public com.massivecraft.mcore.xlib.mongodb.WriteConcern getWriteConcern(){
         if ( _concern != null )
             return _concern;
         return _mongo.getWriteConcern();
@@ -674,7 +674,7 @@ public abstract class DB {
      * Makes it possible to execute "read" queries on a slave node
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public void slaveOk(){
@@ -719,8 +719,8 @@ public abstract class DB {
     final String _name;
 
     protected boolean _readOnly = false;
-    private com.massivecraft.mcore5.xlib.mongodb.WriteConcern _concern;
-    private com.massivecraft.mcore5.xlib.mongodb.ReadPreference _readPref;
+    private com.massivecraft.mcore.xlib.mongodb.WriteConcern _concern;
+    private com.massivecraft.mcore.xlib.mongodb.ReadPreference _readPref;
     final Bytes.OptionHolder _options;
 
     String _username;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBAddress.java b/src/com/massivecraft/mcore/xlib/mongodb/DBAddress.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBAddress.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBAddress.java
index f41a78ab..243733fe 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBAddress.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBAddress.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBApiLayer.java b/src/com/massivecraft/mcore/xlib/mongodb/DBApiLayer.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBApiLayer.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBApiLayer.java
index 7037dda7..93368f91 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBApiLayer.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBApiLayer.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,9 +32,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.mongodb.util.JSON;
 
 /** Database API
  * This cannot be directly instantiated, but the functions are available
@@ -180,7 +180,7 @@ public class DBApiLayer extends DB {
             soFar++;
 
             if ( soFar >= NUM_CURSORS_PER_BATCH ){
-                _connector.say( this , om ,com.massivecraft.mcore5.xlib.mongodb.WriteConcern.NONE );
+                _connector.say( this , om ,com.massivecraft.mcore.xlib.mongodb.WriteConcern.NONE );
                 om = new OutMessage( _mongo , 2007 );
                 om.writeInt( 0 ); // reserved
                 om.writeInt( Math.min( NUM_CURSORS_PER_BATCH , all.size() - totalSoFar ) );
@@ -188,7 +188,7 @@ public class DBApiLayer extends DB {
             }
         }
 
-        _connector.say( this , om ,com.massivecraft.mcore5.xlib.mongodb.WriteConcern.NONE , addr );
+        _connector.say( this , om ,com.massivecraft.mcore.xlib.mongodb.WriteConcern.NONE , addr );
     }
 
     class MyCollection extends DBCollection {
@@ -206,12 +206,12 @@ public class DBApiLayer extends DB {
             super.drop();
         }
 
-        public WriteResult insert(DBObject[] arr, com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        public WriteResult insert(DBObject[] arr, com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
             return insert( arr, true, concern, encoder );
         }
 
-        protected WriteResult insert(DBObject[] arr, boolean shouldApply , com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        protected WriteResult insert(DBObject[] arr, boolean shouldApply , com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
 
             if (encoder == null)
@@ -264,7 +264,7 @@ public class DBApiLayer extends DB {
             return last;
         }
 
-        public WriteResult remove( DBObject o , com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        public WriteResult remove( DBObject o , com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
 
             if (encoder == null)
@@ -323,7 +323,7 @@ public class DBApiLayer extends DB {
         }
 
         @Override
-        public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.massivecraft.mcore5.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
+        public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.massivecraft.mcore.xlib.mongodb.WriteConcern concern, DBEncoder encoder )
             throws MongoException {
 
             if (encoder == null)
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBCallback.java b/src/com/massivecraft/mcore/xlib/mongodb/DBCallback.java
similarity index 87%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBCallback.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBCallback.java
index 3b2d44bd..6c810651 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBCallback.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBCallback.java
@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 
-import com.massivecraft.mcore5.xlib.bson.BSONCallback;
+import com.massivecraft.mcore.xlib.bson.BSONCallback;
 
 /**
  * The DB callback interface.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBCallbackFactory.java b/src/com/massivecraft/mcore/xlib/mongodb/DBCallbackFactory.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBCallbackFactory.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBCallbackFactory.java
index c191fb36..2a379544 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBCallbackFactory.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBCallbackFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  * The DBCallback factory interface.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBCollection.java b/src/com/massivecraft/mcore/xlib/mongodb/DBCollection.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBCollection.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBCollection.java
index af7c672c..51d5b6ac 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBCollection.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBCollection.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 // Mongo
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 
 /** This class provides a skeleton implementation of a database collection.
  * 
    A typical invocation sequence is thus
@@ -182,7 +182,7 @@ public abstract class DBCollection {
     public abstract WriteResult update( DBObject q , DBObject o , boolean upsert , boolean multi , WriteConcern concern, DBEncoder encoder ) throws MongoException ;
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean, com.massivecraft.mcore5.xlib.mongodb.WriteConcern)} with default WriteConcern.
+     * calls {@link DBCollection#update(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean, com.massivecraft.mcore.xlib.mongodb.WriteConcern)} with default WriteConcern.
      * @param q search query for old object to update
      * @param o object with which to update q
      * @param upsert if the database should create the element if it does not exist
@@ -198,7 +198,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=false
+     * calls {@link DBCollection#update(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=false
      * @param q search query for old object to update
      * @param o object with which to update q
      * @return
@@ -210,7 +210,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#update(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=true
+     * calls {@link DBCollection#update(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)} with upsert=false and multi=true
      * @param q search query for old object to update
      * @param o object with which to update q
      * @return
@@ -251,7 +251,7 @@ public abstract class DBCollection {
     public abstract WriteResult remove( DBObject o , WriteConcern concern, DBEncoder encoder ) throws MongoException ;
 
     /**
-     * calls {@link DBCollection#remove(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.WriteConcern)} with the default WriteConcern
+     * calls {@link DBCollection#remove(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.WriteConcern)} with the default WriteConcern
      * @param o the object that documents to be removed must match
      * @return
      * @throws MongoException
@@ -273,7 +273,7 @@ public abstract class DBCollection {
 
 
     /**
-     * Calls {@link DBCollection#find(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, int, int)} and applies the query options
+     * Calls {@link DBCollection#find(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, int, int)} and applies the query options
      * @param query query used to search
      * @param fields the fields of matching objects to return
      * @param numToSkip number of objects to skip
@@ -417,7 +417,7 @@ public abstract class DBCollection {
 
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, remove=false, returnNew=false, upsert=false
      * @param query
      * @param sort
@@ -429,7 +429,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, sort=null, remove=false, returnNew=false, upsert=false
      * @param query
      * @param update
@@ -440,7 +440,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean, boolean)}
+     * calls {@link DBCollection#findAndModify(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, com.massivecraft.mcore.xlib.mongodb.DBObject, boolean, boolean)}
      * with fields=null, sort=null, remove=true, returnNew=false, upsert=false
      * @param query
      * @return the removed document
@@ -452,7 +452,7 @@ public abstract class DBCollection {
     // --- START INDEX CODE ---
 
     /**
-     * calls {@link DBCollection#createIndex(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with default index options
+     * calls {@link DBCollection#createIndex(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with default index options
      * @param keys an object with a key set of the fields desired for the index
      * @throws MongoException
      */
@@ -489,7 +489,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with default options
+     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with default options
      * @param keys an object with a key set of the fields desired for the index
      * @throws MongoException
      */
@@ -499,7 +499,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore5.xlib.mongodb.DBObject, java.lang.String, boolean)} with unique=false
+     * calls {@link DBCollection#ensureIndex(com.massivecraft.mcore.xlib.mongodb.DBObject, java.lang.String, boolean)} with unique=false
      * @param keys fields to use for index
      * @param name an identifier for the index
      * @throws MongoException
@@ -701,7 +701,7 @@ public abstract class DBCollection {
 
 
     /**
-     * calls {@link DBCollection#apply(com.massivecraft.mcore5.xlib.mongodb.DBObject, boolean)} with ensureID=true
+     * calls {@link DBCollection#apply(com.massivecraft.mcore.xlib.mongodb.DBObject, boolean)} with ensureID=true
      * @param o DBObject to which to add fields
      * @return the modified parameter object
      */
@@ -710,7 +710,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#doapply(com.massivecraft.mcore5.xlib.mongodb.DBObject)}, optionally adding an automatic _id field
+     * calls {@link DBCollection#doapply(com.massivecraft.mcore.xlib.mongodb.DBObject)}, optionally adding an automatic _id field
      * @param jo object to add fields to
      * @param ensureID whether to add an _id field
      * @return the modified object o
@@ -729,7 +729,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#save(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.WriteConcern)} with default WriteConcern
+     * calls {@link DBCollection#save(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.WriteConcern)} with default WriteConcern
      * @param jo the DBObject to save
      *        will add _id field to jo if needed
      * @return
@@ -838,7 +838,7 @@ public abstract class DBCollection {
 
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with an empty query and null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with an empty query and null fields.
      *  @return number of documents that match query
      * @throws MongoException
      */
@@ -848,7 +848,7 @@ public abstract class DBCollection {
     }
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject)} with null fields.
+     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject)} with null fields.
      *  @param query query to match
      *  @return
      * @throws MongoException
@@ -859,7 +859,7 @@ public abstract class DBCollection {
     }
 
     /**
-     *  calls {@link DBCollection#getCount(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, long, long)} with limit=0 and skip=0
+     *  calls {@link DBCollection#getCount(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, long, long)} with limit=0 and skip=0
      *  @param query query to match
      *  @param fields fields to return
      *  @return
@@ -946,7 +946,7 @@ public abstract class DBCollection {
     }
 
     /**
-     * calls {@link DBCollection#group(com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, com.massivecraft.mcore5.xlib.mongodb.DBObject, java.lang.String, java.lang.String)} with finalize=null
+     * calls {@link DBCollection#group(com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, com.massivecraft.mcore.xlib.mongodb.DBObject, java.lang.String, java.lang.String)} with finalize=null
      * @param key - { a : true }
      * @param cond - optional condition on query
      * @param reduce javascript reduce function
@@ -992,7 +992,7 @@ public abstract class DBCollection {
 
 
     /**
-     * @deprecated prefer the {@link DBCollection#group(com.massivecraft.mcore5.xlib.mongodb.GroupCommand)} which is more standard
+     * @deprecated prefer the {@link DBCollection#group(com.massivecraft.mcore.xlib.mongodb.GroupCommand)} which is more standard
      * Applies a group operation
      * @param args object representing the arguments to the group function
      * @return
@@ -1428,7 +1428,7 @@ public abstract class DBCollection {
      * makes this query ok to run on a slave node
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public void slaveOk(){
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBConnector.java b/src/com/massivecraft/mcore/xlib/mongodb/DBConnector.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBConnector.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBConnector.java
index f3c7e98b..7af69446 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBConnector.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBConnector.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBCursor.java b/src/com/massivecraft/mcore/xlib/mongodb/DBCursor.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBCursor.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBCursor.java
index 85e04182..aa918291 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBCursor.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBCursor.java
@@ -16,12 +16,12 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.Closeable;
 import java.util.*;
 
-import com.massivecraft.mcore5.xlib.mongodb.DBApiLayer.Result;
+import com.massivecraft.mcore.xlib.mongodb.DBApiLayer.Result;
 
 
 /** An iterator over database results.
@@ -295,7 +295,7 @@ public class DBCursor implements Iterator , Iterable, Closea
      * @return a copy of the same cursor (for chaining)
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public DBCursor slaveOk(){
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBDecoder.java b/src/com/massivecraft/mcore/xlib/mongodb/DBDecoder.java
similarity index 90%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBDecoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBDecoder.java
index 50b2d8f7..84eba43d 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBDecoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBDecoder.java
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore5.xlib.bson.BSONDecoder;
+import com.massivecraft.mcore.xlib.bson.BSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBDecoderFactory.java b/src/com/massivecraft/mcore/xlib/mongodb/DBDecoderFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBDecoderFactory.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBDecoderFactory.java
index bef3bdc3..ae36e511 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBDecoderFactory.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBDecoderFactory.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoder.java b/src/com/massivecraft/mcore/xlib/mongodb/DBEncoder.java
similarity index 83%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBEncoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBEncoder.java
index 4b44ca64..5cb0b340 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBEncoder.java
@@ -11,10 +11,10 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.*;
-import com.massivecraft.mcore5.xlib.bson.io.*;
+import com.massivecraft.mcore.xlib.bson.*;
+import com.massivecraft.mcore.xlib.bson.io.*;
 
 public interface DBEncoder {
     public int writeObject( OutputBuffer buf, BSONObject o );
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoderFactory.java b/src/com/massivecraft/mcore/xlib/mongodb/DBEncoderFactory.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBEncoderFactory.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBEncoderFactory.java
index 8bd1d3ea..8ab22bc7 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBEncoderFactory.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBEncoderFactory.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBObject.java b/src/com/massivecraft/mcore/xlib/mongodb/DBObject.java
similarity index 92%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBObject.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBObject.java
index 5c74fa81..7de77dde 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBObject.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBObject.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
 
 /**
  * A key-value map that can be saved to the database.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBPointer.java b/src/com/massivecraft/mcore/xlib/mongodb/DBPointer.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBPointer.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBPointer.java
index c99c363a..f49ada40 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBPointer.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBPointer.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 
 /**
  * @deprecated
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBPort.java b/src/com/massivecraft/mcore/xlib/mongodb/DBPort.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBPort.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBPort.java
index 72363cfc..598f8910 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBPort.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBPort.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.mongodb.util.ThreadUtil;
+import com.massivecraft.mcore.xlib.mongodb.util.ThreadUtil;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBPortPool.java b/src/com/massivecraft/mcore/xlib/mongodb/DBPortPool.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBPortPool.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBPortPool.java
index d251af06..b77c7d3a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBPortPool.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBPortPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
@@ -33,7 +33,7 @@ import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
-import com.massivecraft.mcore5.xlib.mongodb.util.SimplePool;
+import com.massivecraft.mcore.xlib.mongodb.util.SimplePool;
 
 public class DBPortPool extends SimplePool {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBRef.java b/src/com/massivecraft/mcore/xlib/mongodb/DBRef.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBRef.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBRef.java
index 6c97d17d..2e88e91f 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBRef.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBRef.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
 
 /**
  * overrides DBRefBase to understand a BSONObject representation of a reference.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBRefBase.java b/src/com/massivecraft/mcore/xlib/mongodb/DBRefBase.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBRefBase.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBRefBase.java
index 0e3a28e0..dc87db64 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBRefBase.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBRefBase.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  * represents a database reference, which points to an object stored in the database
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DBTCPConnector.java b/src/com/massivecraft/mcore/xlib/mongodb/DBTCPConnector.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DBTCPConnector.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DBTCPConnector.java
index 3fd65587..bffe5ae1 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DBTCPConnector.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DBTCPConnector.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.mongodb.ReadPreference.TaggedReadPreference;
+import com.massivecraft.mcore.xlib.mongodb.ReadPreference.TaggedReadPreference;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBCallback.java b/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBCallback.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBCallback.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DefaultDBCallback.java
index 0758c5fe..48069196 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBCallback.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBCallback.java
@@ -16,16 +16,16 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 // Bson
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.BasicBSONCallback;
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BasicBSONCallback;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 
 /**
  * This class overrides BasicBSONCallback to implement some extra features specific to the Database.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBDecoder.java b/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBDecoder.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBDecoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DefaultDBDecoder.java
index 0bda43e5..566e6240 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBDecoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBDecoder.java
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore5.xlib.bson.BasicBSONDecoder;
+import com.massivecraft.mcore.xlib.bson.BasicBSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBEncoder.java b/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBEncoder.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBEncoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/DefaultDBEncoder.java
index 62731d61..37058e69 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/DefaultDBEncoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/DefaultDBEncoder.java
@@ -10,15 +10,15 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import static com.massivecraft.mcore5.xlib.bson.BSON.EOO;
-import static com.massivecraft.mcore5.xlib.bson.BSON.OBJECT;
-import static com.massivecraft.mcore5.xlib.bson.BSON.REF;
+import static com.massivecraft.mcore.xlib.bson.BSON.EOO;
+import static com.massivecraft.mcore.xlib.bson.BSON.OBJECT;
+import static com.massivecraft.mcore.xlib.bson.BSON.REF;
 
-import com.massivecraft.mcore5.xlib.bson.*;
-import com.massivecraft.mcore5.xlib.bson.io.*;
-import com.massivecraft.mcore5.xlib.bson.types.*;
+import com.massivecraft.mcore.xlib.bson.*;
+import com.massivecraft.mcore.xlib.bson.io.*;
+import com.massivecraft.mcore.xlib.bson.types.*;
 
 
 public class DefaultDBEncoder extends BasicBSONEncoder implements DBEncoder {
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/GroupCommand.java b/src/com/massivecraft/mcore/xlib/mongodb/GroupCommand.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/GroupCommand.java
rename to src/com/massivecraft/mcore/xlib/mongodb/GroupCommand.java
index dda9248f..d611f51c 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/GroupCommand.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/GroupCommand.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  * This class groups the argument for a group operation and can build the underlying command object
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBCallback.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBCallback.java
similarity index 91%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyDBCallback.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyDBCallback.java
index 4626d89c..beaeeed3 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBCallback.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBCallback.java
@@ -13,13 +13,13 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
 
-import com.massivecraft.mcore5.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.bson.LazyBSONCallback;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBDecoder.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBDecoder.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyDBDecoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyDBDecoder.java
index 052a4e98..7907b6b4 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBDecoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBDecoder.java
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.massivecraft.mcore5.xlib.bson.LazyBSONDecoder;
+import com.massivecraft.mcore.xlib.bson.LazyBSONDecoder;
 
 /**
  *
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBEncoder.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBEncoder.java
similarity index 89%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyDBEncoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyDBEncoder.java
index d7206aba..1c9d9124 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBEncoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBEncoder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.io.OutputBuffer;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.io.OutputBuffer;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBObject.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBObject.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyDBObject.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyDBObject.java
index a69f178e..ad0a163b 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyDBObject.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyDBObject.java
@@ -13,11 +13,11 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore5.xlib.bson.LazyBSONObject;
-import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore.xlib.bson.LazyBSONCallback;
+import com.massivecraft.mcore.xlib.bson.LazyBSONObject;
+import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer;
 
 public class LazyDBObject extends LazyBSONObject implements DBObject {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBCallback.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBCallback.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBCallback.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBCallback.java
index 6810b5f7..ae1bf2e0 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBCallback.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBCallback.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBDecoder.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBDecoder.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBDecoder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBDecoder.java
index fea3fa94..66a86100 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBDecoder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBDecoder.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 
 /**
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBObject.java b/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBObject.java
similarity index 93%
rename from src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBObject.java
rename to src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBObject.java
index 76d1f3ff..426af2ad 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/LazyWriteableDBObject.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/LazyWriteableDBObject.java
@@ -13,16 +13,16 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.LazyBSONCallback;
-import com.massivecraft.mcore5.xlib.bson.io.BSONByteBuffer;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.LazyBSONCallback;
+import com.massivecraft.mcore.xlib.bson.io.BSONByteBuffer;
 
 public class LazyWriteableDBObject extends LazyDBObject {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceCommand.java b/src/com/massivecraft/mcore/xlib/mongodb/MapReduceCommand.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/MapReduceCommand.java
rename to src/com/massivecraft/mcore/xlib/mongodb/MapReduceCommand.java
index 085398dd..b12ddaae 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceCommand.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/MapReduceCommand.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.Map;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceOutput.java b/src/com/massivecraft/mcore/xlib/mongodb/MapReduceOutput.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/MapReduceOutput.java
rename to src/com/massivecraft/mcore/xlib/mongodb/MapReduceOutput.java
index 95f198e4..0c169fe5 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/MapReduceOutput.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/MapReduceOutput.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  * Represents the result of a map/reduce operation
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/Mongo.java b/src/com/massivecraft/mcore/xlib/mongodb/Mongo.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/Mongo.java
rename to src/com/massivecraft/mcore/xlib/mongodb/Mongo.java
index 9cbc9251..2989da70 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/Mongo.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/Mongo.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.massivecraft.mcore5.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.mcore.xlib.bson.io.PoolOutputBuffer;
 
 /**
  * A database connection with internal pooling.
@@ -167,7 +167,7 @@ public class Mongo {
 
     /**
      * Creates a Mongo instance based on a (single) mongodb node
-     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
      * @param addr the database address
      * @throws MongoException
      */
@@ -178,7 +178,7 @@ public class Mongo {
 
     /**
      * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress
-     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
      * @param addr the database address
      * @param options default query options
      * @throws MongoException
@@ -200,7 +200,7 @@ public class Mongo {
      * a replica set and will find all members (the master will be used by
      * default).
    
      *
-     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
      * @param left left side of the pair
      * @param right right side of the pair
      * @throws MongoException
@@ -216,7 +216,7 @@ public class Mongo {
      * a replica set and will find all members (the master will be used by
      * default).
    
      *
-     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
      * @param left left side of the pair
      * @param right right side of the pair
      * @param options
@@ -241,7 +241,7 @@ public class Mongo {
      * It will find all members (the master will be used by default). If you pass in a single server in the list,
      * the driver will still function as if it is a replica set. If you have a standalone server,
      * use the Mongo(ServerAddress) constructor.
    
-     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
      * @param replicaSetSeeds Put as many servers as you can in the list and
      * the system will figure out the rest.
      * @throws MongoException
@@ -254,7 +254,7 @@ public class Mongo {
     /**
      * 
    Creates a Mongo based on a replica set, or pair.
      * It will find all members (the master will be used by default).
    
-     * @see com.massivecraft.mcore5.xlib.mongodb.ServerAddress
+     * @see com.massivecraft.mcore.xlib.mongodb.ServerAddress
      * @param replicaSetSeeds put as many servers as you can in the list.
      *                       the system will figure the rest out
      * @param options default query options
@@ -508,7 +508,7 @@ public class Mongo {
      * makes it possible to run read queries on slave nodes
      *
      * @deprecated Replaced with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public void slaveOk(){
@@ -586,8 +586,8 @@ public class Mongo {
     final Bytes.OptionHolder _netOptions = new Bytes.OptionHolder( null );
     final DBCleanerThread _cleaner;
 
-    com.massivecraft.mcore5.xlib.bson.util.SimplePool _bufferPool =
-        new com.massivecraft.mcore5.xlib.bson.util.SimplePool( 1000 ){
+    com.massivecraft.mcore.xlib.bson.util.SimplePool _bufferPool =
+        new com.massivecraft.mcore.xlib.bson.util.SimplePool( 1000 ){
 
         protected PoolOutputBuffer createNew(){
             return new PoolOutputBuffer();
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/MongoException.java b/src/com/massivecraft/mcore/xlib/mongodb/MongoException.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/MongoException.java
rename to src/com/massivecraft/mcore/xlib/mongodb/MongoException.java
index 0b119d5b..3ec9148f 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/MongoException.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/MongoException.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
 
 /**
  * A general exception raised in Mongo
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/MongoInternalException.java b/src/com/massivecraft/mcore/xlib/mongodb/MongoInternalException.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/MongoInternalException.java
rename to src/com/massivecraft/mcore/xlib/mongodb/MongoInternalException.java
index 77d58072..b046122b 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/MongoInternalException.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/MongoInternalException.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  * An Mongo exception internal to the driver, not carrying any error code
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/MongoOptions.java b/src/com/massivecraft/mcore/xlib/mongodb/MongoOptions.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/MongoOptions.java
rename to src/com/massivecraft/mcore/xlib/mongodb/MongoOptions.java
index e2145311..86c8331d 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/MongoOptions.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/MongoOptions.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import javax.net.SocketFactory;
 
@@ -165,7 +165,7 @@ public class MongoOptions {
      * Default is false.
      *
      * @deprecated Replaced in MongoDB 2.0/Java Driver 2.7 with ReadPreference.SECONDARY
-     * @see com.massivecraft.mcore5.xlib.mongodb.ReadPreference.SECONDARY
+     * @see com.massivecraft.mcore.xlib.mongodb.ReadPreference.SECONDARY
      */
     @Deprecated
     public boolean slaveOk;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/MongoURI.java b/src/com/massivecraft/mcore/xlib/mongodb/MongoURI.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/MongoURI.java
rename to src/com/massivecraft/mcore/xlib/mongodb/MongoURI.java
index 63202956..50269503 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/MongoURI.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/MongoURI.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.net.UnknownHostException;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/OutMessage.java b/src/com/massivecraft/mcore/xlib/mongodb/OutMessage.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/OutMessage.java
rename to src/com/massivecraft/mcore/xlib/mongodb/OutMessage.java
index 77ef479a..f838192d 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/OutMessage.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/OutMessage.java
@@ -16,15 +16,15 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.BasicBSONEncoder;
-import com.massivecraft.mcore5.xlib.bson.io.PoolOutputBuffer;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BasicBSONEncoder;
+import com.massivecraft.mcore.xlib.bson.io.PoolOutputBuffer;
 
 class OutMessage extends BasicBSONEncoder {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/QueryBuilder.java b/src/com/massivecraft/mcore/xlib/mongodb/QueryBuilder.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/QueryBuilder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/QueryBuilder.java
index f1ec3c7d..9f55fe2b 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/QueryBuilder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/QueryBuilder.java
@@ -20,7 +20,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/QueryOperators.java b/src/com/massivecraft/mcore/xlib/mongodb/QueryOperators.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/QueryOperators.java
rename to src/com/massivecraft/mcore/xlib/mongodb/QueryOperators.java
index 63fe171b..647ec050 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/QueryOperators.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/QueryOperators.java
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 /**
  * MongoDB keywords for various query operations
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/RawDBObject.java b/src/com/massivecraft/mcore/xlib/mongodb/RawDBObject.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/mongodb/RawDBObject.java
rename to src/com/massivecraft/mcore/xlib/mongodb/RawDBObject.java
index e6acc82f..916a172a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/RawDBObject.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/RawDBObject.java
@@ -16,30 +16,30 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import static com.massivecraft.mcore5.xlib.bson.BSON.ARRAY;
-import static com.massivecraft.mcore5.xlib.bson.BSON.BINARY;
-import static com.massivecraft.mcore5.xlib.bson.BSON.BOOLEAN;
-import static com.massivecraft.mcore5.xlib.bson.BSON.CODE;
-import static com.massivecraft.mcore5.xlib.bson.BSON.CODE_W_SCOPE;
-import static com.massivecraft.mcore5.xlib.bson.BSON.DATE;
-import static com.massivecraft.mcore5.xlib.bson.BSON.EOO;
-import static com.massivecraft.mcore5.xlib.bson.BSON.MAXKEY;
-import static com.massivecraft.mcore5.xlib.bson.BSON.MINKEY;
-import static com.massivecraft.mcore5.xlib.bson.BSON.NULL;
-import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER;
-import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_INT;
-import static com.massivecraft.mcore5.xlib.bson.BSON.NUMBER_LONG;
-import static com.massivecraft.mcore5.xlib.bson.BSON.OBJECT;
-import static com.massivecraft.mcore5.xlib.bson.BSON.OID;
-import static com.massivecraft.mcore5.xlib.bson.BSON.REF;
-import static com.massivecraft.mcore5.xlib.bson.BSON.REGEX;
-import static com.massivecraft.mcore5.xlib.bson.BSON.STRING;
-import static com.massivecraft.mcore5.xlib.bson.BSON.SYMBOL;
-import static com.massivecraft.mcore5.xlib.bson.BSON.TIMESTAMP;
-import static com.massivecraft.mcore5.xlib.bson.BSON.UNDEFINED;
-import static com.massivecraft.mcore5.xlib.mongodb.util.MyAsserts.assertEquals;
+import static com.massivecraft.mcore.xlib.bson.BSON.ARRAY;
+import static com.massivecraft.mcore.xlib.bson.BSON.BINARY;
+import static com.massivecraft.mcore.xlib.bson.BSON.BOOLEAN;
+import static com.massivecraft.mcore.xlib.bson.BSON.CODE;
+import static com.massivecraft.mcore.xlib.bson.BSON.CODE_W_SCOPE;
+import static com.massivecraft.mcore.xlib.bson.BSON.DATE;
+import static com.massivecraft.mcore.xlib.bson.BSON.EOO;
+import static com.massivecraft.mcore.xlib.bson.BSON.MAXKEY;
+import static com.massivecraft.mcore.xlib.bson.BSON.MINKEY;
+import static com.massivecraft.mcore.xlib.bson.BSON.NULL;
+import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER;
+import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_INT;
+import static com.massivecraft.mcore.xlib.bson.BSON.NUMBER_LONG;
+import static com.massivecraft.mcore.xlib.bson.BSON.OBJECT;
+import static com.massivecraft.mcore.xlib.bson.BSON.OID;
+import static com.massivecraft.mcore.xlib.bson.BSON.REF;
+import static com.massivecraft.mcore.xlib.bson.BSON.REGEX;
+import static com.massivecraft.mcore.xlib.bson.BSON.STRING;
+import static com.massivecraft.mcore.xlib.bson.BSON.SYMBOL;
+import static com.massivecraft.mcore.xlib.bson.BSON.TIMESTAMP;
+import static com.massivecraft.mcore.xlib.bson.BSON.UNDEFINED;
+import static com.massivecraft.mcore.xlib.mongodb.util.MyAsserts.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.util.Date;
@@ -49,8 +49,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 
 /**
  * This object wraps the binary object format ("BSON") used for the transport of serialized objects to / from the Mongo database.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/ReadPreference.java b/src/com/massivecraft/mcore/xlib/mongodb/ReadPreference.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/ReadPreference.java
rename to src/com/massivecraft/mcore/xlib/mongodb/ReadPreference.java
index 18e88d15..865636be 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/ReadPreference.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/ReadPreference.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.util.Map;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/ReflectionDBObject.java b/src/com/massivecraft/mcore/xlib/mongodb/ReflectionDBObject.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/ReflectionDBObject.java
rename to src/com/massivecraft/mcore/xlib/mongodb/ReflectionDBObject.java
index 879032a9..3462a244 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/ReflectionDBObject.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/ReflectionDBObject.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
 
 /**
  * This class enables to map simple Class fields to a BSON object fields
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/ReplicaSetStatus.java b/src/com/massivecraft/mcore/xlib/mongodb/ReplicaSetStatus.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/ReplicaSetStatus.java
rename to src/com/massivecraft/mcore/xlib/mongodb/ReplicaSetStatus.java
index 50145ca6..4e963e46 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/ReplicaSetStatus.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/ReplicaSetStatus.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.util.annotations.Immutable;
-import com.massivecraft.mcore5.xlib.bson.util.annotations.ThreadSafe;
-import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore.xlib.bson.util.annotations.Immutable;
+import com.massivecraft.mcore.xlib.bson.util.annotations.ThreadSafe;
+import com.massivecraft.mcore.xlib.mongodb.util.JSON;
 
 
 import java.net.UnknownHostException;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/Response.java b/src/com/massivecraft/mcore/xlib/mongodb/Response.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/Response.java
rename to src/com/massivecraft/mcore/xlib/mongodb/Response.java
index d1a366f0..3b0f97c7 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/Response.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/Response.java
@@ -16,10 +16,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 // Bson
-import com.massivecraft.mcore5.xlib.bson.io.Bits;
+import com.massivecraft.mcore.xlib.bson.io.Bits;
 
 // Java
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/ServerAddress.java b/src/com/massivecraft/mcore/xlib/mongodb/ServerAddress.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/ServerAddress.java
rename to src/com/massivecraft/mcore/xlib/mongodb/ServerAddress.java
index 7de3eacc..c4993a66 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/ServerAddress.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/ServerAddress.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/ServerError.java b/src/com/massivecraft/mcore/xlib/mongodb/ServerError.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/ServerError.java
rename to src/com/massivecraft/mcore/xlib/mongodb/ServerError.java
index 07f62ace..72fed251 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/ServerError.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/ServerError.java
@@ -16,9 +16,9 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
 
 /**
  * Represents a server error
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/WriteConcern.java b/src/com/massivecraft/mcore/xlib/mongodb/WriteConcern.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/WriteConcern.java
rename to src/com/massivecraft/mcore/xlib/mongodb/WriteConcern.java
index 0f85c522..e7982c1a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/WriteConcern.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/WriteConcern.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/WriteResult.java b/src/com/massivecraft/mcore/xlib/mongodb/WriteResult.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/WriteResult.java
rename to src/com/massivecraft/mcore/xlib/mongodb/WriteResult.java
index 803e5bce..235bfa9a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/WriteResult.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/WriteResult.java
@@ -1,6 +1,6 @@
 // WriteResult.java
 
-package com.massivecraft.mcore5.xlib.mongodb;
+package com.massivecraft.mcore.xlib.mongodb;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/CLI.java b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/CLI.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/gridfs/CLI.java
rename to src/com/massivecraft/mcore/xlib/mongodb/gridfs/CLI.java
index a7344469..57442077 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/CLI.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/CLI.java
@@ -16,15 +16,15 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.gridfs;
+package com.massivecraft.mcore.xlib.mongodb.gridfs;
 
 import java.io.File;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
-import com.massivecraft.mcore5.xlib.mongodb.Mongo;
-import com.massivecraft.mcore5.xlib.mongodb.util.Util;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.mongodb.Mongo;
+import com.massivecraft.mcore.xlib.mongodb.util.Util;
 
 
 /**
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFS.java b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFS.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFS.java
rename to src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFS.java
index c404e554..e6d08d3a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFS.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFS.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.gridfs;
+package com.massivecraft.mcore.xlib.mongodb.gridfs;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -27,13 +27,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore5.xlib.mongodb.DB;
-import com.massivecraft.mcore5.xlib.mongodb.DBCollection;
-import com.massivecraft.mcore5.xlib.mongodb.DBCursor;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.mcore.xlib.mongodb.DB;
+import com.massivecraft.mcore.xlib.mongodb.DBCollection;
+import com.massivecraft.mcore.xlib.mongodb.DBCursor;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
 
 /**
  *  Implementation of GridFS v1.0
@@ -66,7 +66,7 @@ public class GridFS {
     /**
      * Creates a GridFS instance for the default bucket "fs"
      * in the given database. Set the preferred WriteConcern on the give DB with DB.setWriteConcern
-     * @see com.massivecraft.mcore5.xlib.mongodb.WriteConcern
+     * @see com.massivecraft.mcore.xlib.mongodb.WriteConcern
      * @param db database to work with
      */
     public GridFS(DB db) {
@@ -77,7 +77,7 @@ public class GridFS {
      * Creates a GridFS instance for the specified bucket
      * in the given database.  Set the preferred WriteConcern on the give DB with DB.setWriteConcern
      *
-     * @see com.massivecraft.mcore5.xlib.mongodb.WriteConcern
+     * @see com.massivecraft.mcore.xlib.mongodb.WriteConcern
      * @param db database to work with
      * @param bucket bucket to use in the given database
      */
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSDBFile.java b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSDBFile.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSDBFile.java
rename to src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSDBFile.java
index 8bd41560..338a91a4 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSDBFile.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSDBFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.gridfs;
+package com.massivecraft.mcore.xlib.mongodb.gridfs;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,10 +24,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
-import com.massivecraft.mcore5.xlib.mongodb.MongoException;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.mongodb.MongoException;
 
 /**
  * This class enables to retrieve a GridFS file metadata and content.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSFile.java b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSFile.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSFile.java
rename to src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSFile.java
index da09f217..6f2b0cfe 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSFile.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.gridfs;
+package com.massivecraft.mcore.xlib.mongodb.gridfs;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,11 +27,11 @@ import java.util.Map;
 import java.util.Set;
 
 
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
-import com.massivecraft.mcore5.xlib.mongodb.MongoException;
-import com.massivecraft.mcore5.xlib.mongodb.util.JSON;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.mongodb.MongoException;
+import com.massivecraft.mcore.xlib.mongodb.util.JSON;
 
 /**
  * The abstract class representing a GridFS file
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSInputFile.java b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSInputFile.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSInputFile.java
rename to src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSInputFile.java
index 0f57d7ae..7d72fa38 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/GridFSInputFile.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/GridFSInputFile.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.gridfs;
+package com.massivecraft.mcore.xlib.mongodb.gridfs;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,12 +25,12 @@ import java.security.MessageDigest;
 import java.util.Date;
 
 
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObjectBuilder;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
-import com.massivecraft.mcore5.xlib.mongodb.MongoException;
-import com.massivecraft.mcore5.xlib.mongodb.util.SimplePool;
-import com.massivecraft.mcore5.xlib.mongodb.util.Util;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObjectBuilder;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.mongodb.MongoException;
+import com.massivecraft.mcore.xlib.mongodb.util.SimplePool;
+import com.massivecraft.mcore.xlib.mongodb.util.Util;
 
 /**
  * This class represents a GridFS file to be written to the database
@@ -179,7 +179,7 @@ public class GridFSInputFile extends GridFSFile {
     }
 
     /**
-     * @see com.massivecraft.mcore5.xlib.mongodb.gridfs.GridFSInputFile#saveChunks(long)
+     * @see com.massivecraft.mcore.xlib.mongodb.gridfs.GridFSInputFile#saveChunks(long)
      *
      * @return Number of the next chunk.
      * @throws IOException
@@ -345,7 +345,7 @@ public class GridFSInputFile extends GridFSFile {
         /**
          * {@inheritDoc}
          *
-         * @see com.massivecraft.mcore5.xlib.mongodb.util.SimplePool#createNew()
+         * @see com.massivecraft.mcore.xlib.mongodb.util.SimplePool#createNew()
          */
         protected MessageDigest createNew() {
             try {
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/gridfs/package.html b/src/com/massivecraft/mcore/xlib/mongodb/gridfs/package.html
similarity index 100%
rename from src/com/massivecraft/mcore5/xlib/mongodb/gridfs/package.html
rename to src/com/massivecraft/mcore/xlib/mongodb/gridfs/package.html
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferFactory.java b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferFactory.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferFactory.java
rename to src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferFactory.java
index db36975c..c05b2438 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferFactory.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferFactory.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.io;
+package com.massivecraft.mcore.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferHolder.java b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferHolder.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferHolder.java
rename to src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferHolder.java
index 8a0107a6..c9bf2021 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferHolder.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferHolder.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.io;
+package com.massivecraft.mcore.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferInputStream.java b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferInputStream.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferInputStream.java
rename to src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferInputStream.java
index c436b038..1d32b9f8 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferInputStream.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferInputStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.io;
+package com.massivecraft.mcore.xlib.mongodb.io;
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferOutputStream.java b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferOutputStream.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferOutputStream.java
rename to src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferOutputStream.java
index e0c5499a..a0b9e1c5 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteBufferOutputStream.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteBufferOutputStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.io;
+package com.massivecraft.mcore.xlib.mongodb.io;
 
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteStream.java b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteStream.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/io/ByteStream.java
rename to src/com/massivecraft/mcore/xlib/mongodb/io/ByteStream.java
index 2bad2f5b..bd2671ec 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/io/ByteStream.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/io/ByteStream.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.io;
+package com.massivecraft.mcore.xlib.mongodb.io;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/package.html b/src/com/massivecraft/mcore/xlib/mongodb/package.html
similarity index 100%
rename from src/com/massivecraft/mcore5/xlib/mongodb/package.html
rename to src/com/massivecraft/mcore/xlib/mongodb/package.html
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/AbstractObjectSerializer.java b/src/com/massivecraft/mcore/xlib/mongodb/util/AbstractObjectSerializer.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/AbstractObjectSerializer.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/AbstractObjectSerializer.java
index b8bcd77e..2f3354ed 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/AbstractObjectSerializer.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/AbstractObjectSerializer.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 abstract class AbstractObjectSerializer implements ObjectSerializer {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/Args.java b/src/com/massivecraft/mcore/xlib/mongodb/util/Args.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/Args.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/Args.java
index cf365ab7..06e290c9 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/Args.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/Args.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/Base64Codec.java b/src/com/massivecraft/mcore/xlib/mongodb/util/Base64Codec.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/Base64Codec.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/Base64Codec.java
index d46590b1..4fa983a3 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/Base64Codec.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/Base64Codec.java
@@ -15,7 +15,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 /*
  *      Copyright (C) 2012 10gen Inc.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/ClassMapBasedObjectSerializer.java b/src/com/massivecraft/mcore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
index acca2b33..d37ab14a 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
@@ -15,10 +15,10 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
-import com.massivecraft.mcore5.xlib.bson.util.ClassMap;
-import com.massivecraft.mcore5.xlib.mongodb.Bytes;
+import com.massivecraft.mcore.xlib.bson.util.ClassMap;
+import com.massivecraft.mcore.xlib.mongodb.Bytes;
 
 
 import java.util.List;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/FastStack.java b/src/com/massivecraft/mcore/xlib/mongodb/util/FastStack.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/FastStack.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/FastStack.java
index 0e2929df..7b533a24 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/FastStack.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/FastStack.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/Hash.java b/src/com/massivecraft/mcore/xlib/mongodb/util/Hash.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/Hash.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/Hash.java
index f4edfb0a..c21ba7d6 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/Hash.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/Hash.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 public final class Hash {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/IdentitySet.java b/src/com/massivecraft/mcore/xlib/mongodb/util/IdentitySet.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/IdentitySet.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/IdentitySet.java
index 2ea87ffc..f9d80824 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/IdentitySet.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/IdentitySet.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.Collection;
 import java.util.IdentityHashMap;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSON.java b/src/com/massivecraft/mcore/xlib/mongodb/util/JSON.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/JSON.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/JSON.java
index 80973c3c..b08ba156 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSON.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/JSON.java
@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 
-import com.massivecraft.mcore5.xlib.bson.BSONCallback;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.bson.BSONCallback;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
 
 /**
  *   Helper methods for JSON serialization and de-serialization
@@ -34,7 +34,7 @@ public class JSON {
      *
      * @param o object to serialize
      * @return  String containing JSON form of the object
-     * @see com.massivecraft.mcore5.xlib.mongodb.util.JSONSerializers#getLegacy()
+     * @see com.massivecraft.mcore.xlib.mongodb.util.JSONSerializers#getLegacy()
      */
     public static String serialize( Object o ){
         StringBuilder buf = new StringBuilder();
@@ -50,7 +50,7 @@ public class JSON {
      * @param o object to serialize
      * @param buf StringBuilder containing the JSON representation under construction 
      * @return String containing JSON form of the object
-     * @see com.massivecraft.mcore5.xlib.mongodb.util.JSONSerializers#getLegacy()
+     * @see com.massivecraft.mcore.xlib.mongodb.util.JSONSerializers#getLegacy()
      */
     public static void serialize( Object o, StringBuilder buf) {
         JSONSerializers.getLegacy().serialize(o, buf);
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONCallback.java b/src/com/massivecraft/mcore/xlib/mongodb/util/JSONCallback.java
similarity index 85%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/JSONCallback.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/JSONCallback.java
index 1b779724..5474f4a1 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONCallback.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/JSONCallback.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -27,19 +27,19 @@ import java.util.UUID;
 import java.util.regex.Pattern;
 
 
-import com.massivecraft.mcore5.xlib.bson.BSON;
-import com.massivecraft.mcore5.xlib.bson.BSONObject;
-import com.massivecraft.mcore5.xlib.bson.BasicBSONCallback;
-import com.massivecraft.mcore5.xlib.bson.types.BSONTimestamp;
-import com.massivecraft.mcore5.xlib.bson.types.Code;
-import com.massivecraft.mcore5.xlib.bson.types.CodeWScope;
-import com.massivecraft.mcore5.xlib.bson.types.MaxKey;
-import com.massivecraft.mcore5.xlib.bson.types.MinKey;
-import com.massivecraft.mcore5.xlib.bson.types.ObjectId;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBList;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
-import com.massivecraft.mcore5.xlib.mongodb.DBRef;
+import com.massivecraft.mcore.xlib.bson.BSON;
+import com.massivecraft.mcore.xlib.bson.BSONObject;
+import com.massivecraft.mcore.xlib.bson.BasicBSONCallback;
+import com.massivecraft.mcore.xlib.bson.types.BSONTimestamp;
+import com.massivecraft.mcore.xlib.bson.types.Code;
+import com.massivecraft.mcore.xlib.bson.types.CodeWScope;
+import com.massivecraft.mcore.xlib.bson.types.MaxKey;
+import com.massivecraft.mcore.xlib.bson.types.MinKey;
+import com.massivecraft.mcore.xlib.bson.types.ObjectId;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBList;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.mongodb.DBRef;
 
 public class JSONCallback extends BasicBSONCallback {
     
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONParseException.java b/src/com/massivecraft/mcore/xlib/mongodb/util/JSONParseException.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/JSONParseException.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/JSONParseException.java
index 8e77e4a7..955bf067 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONParseException.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/JSONParseException.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 /**
  * Exception throw when invalid JSON is passed to JSONParser.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONSerializers.java b/src/com/massivecraft/mcore/xlib/mongodb/util/JSONSerializers.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/JSONSerializers.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/JSONSerializers.java
index 164220db..62e30b68 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/JSONSerializers.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/JSONSerializers.java
@@ -14,13 +14,13 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
-import com.massivecraft.mcore5.xlib.bson.types.*;
-import com.massivecraft.mcore5.xlib.mongodb.BasicDBObject;
-import com.massivecraft.mcore5.xlib.mongodb.Bytes;
-import com.massivecraft.mcore5.xlib.mongodb.DBObject;
-import com.massivecraft.mcore5.xlib.mongodb.DBRefBase;
+import com.massivecraft.mcore.xlib.bson.types.*;
+import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
+import com.massivecraft.mcore.xlib.mongodb.Bytes;
+import com.massivecraft.mcore.xlib.mongodb.DBObject;
+import com.massivecraft.mcore.xlib.mongodb.DBRefBase;
 
 
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/MyAsserts.java b/src/com/massivecraft/mcore/xlib/mongodb/util/MyAsserts.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/MyAsserts.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/MyAsserts.java
index f7798d72..24f7a5a3 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/MyAsserts.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/MyAsserts.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.Arrays;
 import java.util.regex.Pattern;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/ObjectSerializer.java b/src/com/massivecraft/mcore/xlib/mongodb/util/ObjectSerializer.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/ObjectSerializer.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/ObjectSerializer.java
index 11c4119c..14ad8fee 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/ObjectSerializer.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/ObjectSerializer.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 /**
  * Interface describing methods for serializing an object to a string.
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/OptionMap.java b/src/com/massivecraft/mcore/xlib/mongodb/util/OptionMap.java
similarity index 94%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/OptionMap.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/OptionMap.java
index 9b853cf2..3bf60ac0 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/OptionMap.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/OptionMap.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.TreeMap;
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/SimplePool.java b/src/com/massivecraft/mcore/xlib/mongodb/util/SimplePool.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/SimplePool.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/SimplePool.java
index 873c5abe..2ea95b08 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/SimplePool.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/SimplePool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/StringBuilderPool.java b/src/com/massivecraft/mcore/xlib/mongodb/util/StringBuilderPool.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/StringBuilderPool.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/StringBuilderPool.java
index 4039676f..62f14d98 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/StringBuilderPool.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/StringBuilderPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 public class StringBuilderPool extends SimplePool {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/StringParseUtil.java b/src/com/massivecraft/mcore/xlib/mongodb/util/StringParseUtil.java
similarity index 99%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/StringParseUtil.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/StringParseUtil.java
index 886b0683..199e5ff2 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/StringParseUtil.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/StringParseUtil.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 public final class StringParseUtil {
 
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadPool.java b/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadPool.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadPool.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/ThreadPool.java
index 42ced171..3b891063 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadPool.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadPool.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadUtil.java b/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadUtil.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadUtil.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/ThreadUtil.java
index acefced9..e8585dcb 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/ThreadUtil.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/ThreadUtil.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/TimeConstants.java b/src/com/massivecraft/mcore/xlib/mongodb/util/TimeConstants.java
similarity index 96%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/TimeConstants.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/TimeConstants.java
index cfec016a..b87eac98 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/TimeConstants.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/TimeConstants.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 public class TimeConstants {
     
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/UniqueList.java b/src/com/massivecraft/mcore/xlib/mongodb/util/UniqueList.java
similarity index 95%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/UniqueList.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/UniqueList.java
index 82c2d031..c91cf7f3 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/UniqueList.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/UniqueList.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/Util.java b/src/com/massivecraft/mcore/xlib/mongodb/util/Util.java
similarity index 97%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/Util.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/Util.java
index 0b38c5be..5e9fbc4b 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/Util.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/Util.java
@@ -14,7 +14,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/WeakBag.java b/src/com/massivecraft/mcore/xlib/mongodb/util/WeakBag.java
similarity index 98%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/WeakBag.java
rename to src/com/massivecraft/mcore/xlib/mongodb/util/WeakBag.java
index 6e306bd1..73b5e81f 100644
--- a/src/com/massivecraft/mcore5/xlib/mongodb/util/WeakBag.java
+++ b/src/com/massivecraft/mcore/xlib/mongodb/util/WeakBag.java
@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-package com.massivecraft.mcore5.xlib.mongodb.util;
+package com.massivecraft.mcore.xlib.mongodb.util;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore5/xlib/mongodb/util/package.html b/src/com/massivecraft/mcore/xlib/mongodb/util/package.html
similarity index 100%
rename from src/com/massivecraft/mcore5/xlib/mongodb/util/package.html
rename to src/com/massivecraft/mcore/xlib/mongodb/util/package.html
diff --git a/src/com/massivecraft/mcore5/xlib/gson/package-info.java b/src/com/massivecraft/mcore5/xlib/gson/package-info.java
deleted file mode 100644
index 64db0cd3..00000000
--- a/src/com/massivecraft/mcore5/xlib/gson/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * This package provides the {@link com.massivecraft.mcore5.xlib.gson.Gson} class to convert Json to Java and
- * vice-versa.
- *
- * 
    The primary class to use is {@link com.massivecraft.mcore5.xlib.gson.Gson} which can be constructed with
- * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore5.xlib.gson.GsonBuilder}
- * (to configure various options such as using versioning and so on).
    
- *
- * @author Inderjeet Singh, Joel Leitch
- */
-package com.massivecraft.mcore5.xlib.gson;
\ No newline at end of file