From 96dcb95b7c020e7fb8e9c990643040670eaf4ce2 Mon Sep 17 00:00:00 2001 From: Matt <4009945+MattBDev@users.noreply.github.com> Date: Mon, 5 Oct 2020 13:41:41 -0400 Subject: [PATCH] Javadoc and Formatting fixes. (#619) Javadoc and Formatting fixes. Also, extremely minor code changes which have been tested. This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. * Updated PlotSquared URL * Removed plugin acronyms * Fixed a typo * Fixed grammar * Use modern block id's * Update YouTube video URL --- README.md | 98 +- buildSrc/src/main/kotlin/PlatformConfig.kt | 1 + config/checkstyle/checkstyle-suppression.xml | 9 + config/checkstyle/checkstyle.xml | 3 + contrib/craftscripts/draw.js | 16 +- contrib/craftscripts/roof.js | 4 +- .../com/boydti/fawe/bukkit/FaweBukkit.java | 9 +- .../bukkit/adapter/BukkitQueueHandler.java | 10 +- .../mc1_15_2/BlockMaterial_1_15_2.java | 8 +- .../mc1_15_2/BukkitAdapter_1_15_2.java | 44 +- .../mc1_15_2/BukkitGetBlocks_1_15_2.java | 99 +- .../FAWEWorldNativeAccess_1_15_2.java | 7 +- .../mc1_16_1/BlockMaterial_1_16_1.java | 9 +- .../mc1_16_1/BukkitAdapter_1_16_1.java | 62 +- .../mc1_16_1/BukkitGetBlocks_1_16_1.java | 127 +- .../mc1_16_1/FAWEWorldNativeAccess_1_16.java | 7 +- .../mc1_16_2/BlockMaterial_1_16_2.java | 9 +- .../mc1_16_2/BukkitAdapter_1_16_2.java | 15 +- .../mc1_16_2/BukkitGetBlocks_1_16_2.java | 127 +- .../mc1_16_2/FAWEWorldNativeAccess_1_16.java | 7 +- .../fawe/bukkit/filter/WorldGuardFilter.java | 15 +- .../bukkit/listener/BukkitImageListener.java | 320 +++-- .../bukkit/listener/CFIPacketListener.java | 63 +- .../fawe/bukkit/listener/ChunkListener.java | 29 +- ...unkListener_9.java => ChunkListener9.java} | 7 +- .../bukkit/listener/ChunkListener_8Plus.java | 18 - .../fawe/bukkit/listener/RenderListener.java | 16 +- .../bukkit/preloader/PluginPreloader.java | 31 +- .../fawe/bukkit/regions/FreeBuildRegion.java | 31 +- .../fawe/bukkit/regions/ResidenceFeature.java | 2 +- .../fawe/bukkit/regions/TownyFeature.java | 9 +- .../fawe/bukkit/regions/Worldguard.java | 14 +- .../plotsquared/FaweRegionManager.java | 6 +- .../plotsquared/FaweSchematicHandler.java | 7 +- .../bukkit/regions/plotsquared/MoveTo512.java | 4 +- .../regions/plotsquared/PlotRegionFilter.java | 6 +- .../regions/plotsquared/PlotSetBiome.java | 3 +- .../plotsquared/PlotSquaredFeature.java | 40 +- .../plotsquaredv4/FaweChunkManager.java | 5 +- .../plotsquaredv4/FaweSchematicHandler.java | 7 +- .../plotsquaredv4/PlotRegionFilter.java | 6 +- .../plotsquaredv4/PlotSquaredFeature.java | 31 +- .../com/boydti/fawe/bukkit/util/ItemUtil.java | 24 +- .../bukkit/util/image/BukkitImageViewer.java | 31 +- .../fawe/bukkit/wrapper/AsyncBlock.java | 19 +- .../fawe/bukkit/wrapper/AsyncChunk.java | 3 +- .../fawe/bukkit/wrapper/AsyncWorld.java | 310 +++-- .../wrapper/state/AsyncDataContainer.java | 23 +- .../fawe/bukkit/wrapper/state/AsyncSign.java | 28 +- .../sk89q/worldedit/bukkit/BukkitAdapter.java | 33 +- .../bukkit/BukkitBlockCommandSender.java | 1 + .../worldedit/bukkit/BukkitBlockRegistry.java | 12 +- .../bukkit/BukkitCommandInspector.java | 11 +- .../worldedit/bukkit/BukkitCommandSender.java | 30 +- .../bukkit/BukkitEntityProperties.java | 4 +- .../bukkit/BukkitEntityRegistry.java | 6 +- .../sk89q/worldedit/bukkit/BukkitPlayer.java | 12 +- .../worldedit/bukkit/WorldEditListener.java | 8 +- .../bukkit/adapter/BukkitImplAdapter.java | 20 +- .../bukkit/adapter/CachedBukkitAdapter.java | 31 +- .../bukkit/adapter/IBukkitAdapter.java | 6 +- .../bukkit/adapter/SimpleBukkitAdapter.java | 8 +- .../adapter/impl/FAWE_Spigot_v1_15_R2.java | 68 +- .../adapter/impl/FAWE_Spigot_v1_16_R1.java | 16 +- .../adapter/impl/FAWE_Spigot_v1_16_R2.java | 58 +- .../src/main/java/com/boydti/fawe/Fawe.java | 129 +- .../main/java/com/boydti/fawe/FaweAPI.java | 122 +- .../main/java/com/boydti/fawe/FaweCache.java | 16 +- .../java/com/boydti/fawe/FaweVersion.java | 6 +- .../com/boydti/fawe/beta/CombinedBlocks.java | 20 +- .../com/boydti/fawe/beta/IBatchProcessor.java | 41 +- .../java/com/boydti/fawe/beta/IBlocks.java | 2 +- .../java/com/boydti/fawe/beta/IChunkSet.java | 6 +- .../com/boydti/fawe/beta/IQueueExtent.java | 29 +- .../java/com/boydti/fawe/beta/Trimable.java | 11 +- .../implementation/blocks/BitSetBlocks.java | 34 +- .../implementation/blocks/CharBlocks.java | 2 +- .../implementation/blocks/CharSetBlocks.java | 10 +- .../blocks/FallbackChunkGet.java | 4 +- .../beta/implementation/cache/ChunkCache.java | 2 +- .../cache/preloader/AsyncPreloader.java | 7 +- .../implementation/chunk/ChunkHolder.java | 13 +- .../implementation/filter/LinkedFilter.java | 4 +- .../implementation/filter/MaskFilter.java | 2 +- .../filter/block/AbstractFilterBlock.java | 10 +- .../filter/block/ArrayFilterBlock.java | 21 +- .../filter/block/CharFilterBlock.java | 18 +- .../filter/block/ChunkFilterBlock.java | 58 +- .../filter/block/SingleFilterBlock.java | 4 +- .../implementation/lighting/NMSRelighter.java | 24 +- .../implementation/lighting/Relighter.java | 20 +- .../implementation/packet/ChunkPacket.java | 4 +- .../processors/LimitExtent.java | 8 +- .../processors/MultiBatchProcessor.java | 6 +- .../PersistentChunkSendProcessor.java | 8 +- .../queue/ParallelQueueExtent.java | 3 +- .../beta/implementation/queue/QueuePool.java | 4 +- .../queue/SingleThreadQueueExtent.java | 16 +- .../boydti/fawe/command/AnvilCommands.java | 111 +- .../com/boydti/fawe/command/CFICommands.java | 26 +- .../command/SuggestInputParseException.java | 12 +- .../java/com/boydti/fawe/config/Caption.java | 5 +- .../java/com/boydti/fawe/config/Config.java | 67 +- .../java/com/boydti/fawe/config/Settings.java | 19 +- .../fawe/configuration/Configuration.java | 60 +- .../configuration/ConfigurationSection.java | 585 +++++---- .../fawe/configuration/MemorySection.java | 6 +- .../fawe/configuration/TypeDescription.java | 52 +- .../com/boydti/fawe/configuration/Yaml.java | 111 +- .../file/YamlConfigurationOptions.java | 7 +- .../com/boydti/fawe/database/DBHandler.java | 2 +- .../fawe/database/RollbackDatabase.java | 94 +- .../com/boydti/fawe/jnbt/anvil/MCAChunk.java | 39 +- .../com/boydti/fawe/jnbt/anvil/MCAFile.java | 9 +- .../fawe/jnbt/streamer/StreamDelegate.java | 4 +- .../boydti/fawe/object/DataAnglePattern.java | 8 +- .../com/boydti/fawe/object/FaweLimit.java | 78 +- .../com/boydti/fawe/object/RegionWrapper.java | 2 +- .../boydti/fawe/object/brush/BlendBall.java | 1 - .../boydti/fawe/object/brush/BlobBrush.java | 10 +- .../fawe/object/brush/CatenaryBrush.java | 27 +- .../fawe/object/brush/CopyPastaBrush.java | 6 +- .../boydti/fawe/object/brush/ErodeBrush.java | 5 +- .../fawe/object/brush/FallingSphere.java | 4 +- .../boydti/fawe/object/brush/HeightBrush.java | 16 +- .../boydti/fawe/object/brush/ImageBrush.java | 1 - .../fawe/object/brush/InspectBrush.java | 2 +- .../boydti/fawe/object/brush/LineBrush.java | 4 +- .../boydti/fawe/object/brush/RockBrush.java | 6 +- .../fawe/object/brush/SurfaceSpline.java | 24 +- .../brush/heightmap/ArrayHeightMap.java | 6 +- .../object/brush/heightmap/HeightMap.java | 10 +- .../fawe/object/brush/scroll/Scroll.java | 15 +- .../object/brush/sweep/ClipboardSpline.java | 50 +- .../fawe/object/brush/sweep/SweepBrush.java | 6 +- .../brush/visualization/cfi/CFIDrawer.java | 32 +- .../cfi/HeightMapMCAGenerator.java | 2 +- .../brush/visualization/cfi/MCAWriter.java | 5 +- .../fawe/object/change/StreamChange.java | 2 +- .../object/changeset/AbstractChangeSet.java | 8 +- .../changeset/AbstractDelegateChangeSet.java | 96 +- .../object/changeset/BlockBagChangeSet.java | 3 +- .../fawe/object/changeset/CFIChangeSet.java | 14 +- .../object/changeset/DiskStorageHistory.java | 30 +- .../object/changeset/FaweStreamChangeSet.java | 12 +- .../changeset/MemoryOptimizedHistory.java | 24 +- .../clipboard/CPUOptimizedClipboard.java | 6 +- .../clipboard/DiskOptimizedClipboard.java | 16 +- .../clipboard/MemoryOptimizedClipboard.java | 6 +- .../clipboard/MultiClipboardHolder.java | 24 +- .../object/clipboard/URIClipboardHolder.java | 3 +- .../object/clipboard/WorldCopyClipboard.java | 4 +- .../fawe/object/collection/BitArray.java | 16 +- .../collection/BitArrayUnstretched.java | 12 +- .../object/collection/BlockVectorSet.java | 14 +- .../collection/CleanableThreadLocal.java | 4 +- .../object/collection/DifferentialArray.java | 13 +- .../collection/DifferentialBlockBuffer.java | 34 +- .../DifferentialCharBlockBuffer.java | 36 +- .../fawe/object/collection/FastBitSet.java | 108 +- .../collection/FastRandomCollection.java | 10 +- .../fawe/object/collection/IAdaptedMap.java | 12 +- .../collection/LocalBlockVector2DSet.java | 4 +- .../collection/LocalBlockVectorSet.java | 3 +- .../fawe/object/collection/LongHashSet.java | 48 +- .../fawe/object/collection/MemBlockSet.java | 181 ++- .../fawe/object/collection/MutablePair.java | 4 +- .../collection/SimpleRandomCollection.java | 4 +- .../fawe/object/collection/SparseBitSet.java | 5 +- .../object/collection/SummedColorTable.java | 24 +- .../fawe/object/exception/FaweException.java | 6 +- .../object/extent/BlockTranslateExtent.java | 4 +- .../object/extent/ExtentHeightCacher.java | 1 + .../fawe/object/extent/HeightBoundExtent.java | 3 +- .../boydti/fawe/object/extent/NullExtent.java | 24 +- .../fawe/object/extent/OffsetExtent.java | 4 +- .../object/extent/RandomOffsetTransform.java | 4 +- .../fawe/object/extent/ScaleTransform.java | 4 +- .../fawe/object/extent/StripNBTExtent.java | 14 +- .../fawe/object/extent/TemporalExtent.java | 11 +- .../fawe/object/function/block/BiomeCopy.java | 2 +- .../function/block/CombinedBlockCopy.java | 2 +- .../object/io/AsyncBufferedOutputStream.java | 5 +- .../object/io/BufferedRandomAccessFile.java | 73 +- .../object/io/LittleEndianOutputStream.java | 21 +- .../fawe/object/io/PGZIPOutputStream.java | 11 +- .../boydti/fawe/object/mask/CachedMask.java | 12 +- .../boydti/fawe/object/mask/ExtremaMask.java | 33 +- .../fawe/object/mask/MaskedTargetBlock.java | 4 +- .../boydti/fawe/object/mask/PlaneMask.java | 4 +- .../boydti/fawe/object/mask/ROCAngleMask.java | 12 +- .../boydti/fawe/object/mask/RadiusMask.java | 3 +- .../boydti/fawe/object/mask/SimplexMask.java | 4 +- .../com/boydti/fawe/object/mask/WallMask.java | 43 +- .../object/pattern/AngleColorPattern.java | 30 +- .../object/pattern/AverageColorPattern.java | 8 +- .../fawe/object/pattern/BufferedPattern.java | 4 +- .../fawe/object/pattern/OffsetPattern.java | 4 +- .../fawe/object/pattern/PatternTraverser.java | 10 +- .../fawe/object/pattern/PropertyPattern.java | 44 +- .../object/pattern/RandomOffsetPattern.java | 8 +- .../fawe/object/pattern/SaturatePattern.java | 8 +- .../pattern/SolidRandomOffsetPattern.java | 8 +- .../fawe/object/regions/FuzzyRegion.java | 7 +- .../fawe/object/regions/PolyhedralRegion.java | 24 +- .../boydti/fawe/object/regions/Triangle.java | 24 +- .../object/schematic/MinecraftStructure.java | 4 +- .../fawe/object/schematic/PNGWriter.java | 5 +- .../object/schematic/visualizer/SchemVis.java | 28 +- .../object/string/JoinedCharSequence.java | 4 +- .../object/string/MutableCharSequence.java | 14 +- .../fawe/object/task/AsyncNotifyQueue.java | 8 +- .../task/SingleThreadIntervalQueue.java | 7 +- .../fawe/object/visitor/DFSVisitor.java | 4 +- .../boydti/fawe/regions/FaweMaskManager.java | 17 +- .../java/com/boydti/fawe/util/BrushCache.java | 60 +- .../com/boydti/fawe/util/CachedMathMan.java | 31 +- .../boydti/fawe/util/CleanTextureUtil.java | 11 +- .../java/com/boydti/fawe/util/ColorUtil.java | 4 +- .../boydti/fawe/util/EditSessionBuilder.java | 19 +- .../boydti/fawe/util/FilteredTextureUtil.java | 4 +- .../java/com/boydti/fawe/util/IOUtil.java | 3 +- .../java/com/boydti/fawe/util/MainUtil.java | 63 +- .../java/com/boydti/fawe/util/MathMan.java | 87 +- .../java/com/boydti/fawe/util/MemUtil.java | 6 +- .../boydti/fawe/util/RandomTextureUtil.java | 12 +- .../com/boydti/fawe/util/ReflectionUtils.java | 153 +-- .../java/com/boydti/fawe/util/StringMan.java | 59 +- .../com/boydti/fawe/util/TaskManager.java | 2 +- .../com/boydti/fawe/util/TextureUtil.java | 8 +- .../java/com/boydti/fawe/util/WEManager.java | 24 +- .../com/boydti/fawe/util/image/ImageUtil.java | 3 +- .../java/com/boydti/fawe/web/SchemSync.java | 11 +- .../boydti/fawe/wrappers/WorldWrapper.java | 189 ++- .../main/java/com/sk89q/jnbt/CompoundTag.java | 4 +- .../com/sk89q/jnbt/CompressedCompoundTag.java | 4 +- .../java/com/sk89q/jnbt/NBTInputStream.java | 40 +- .../util/commands/CommandContext.java | 4 +- .../java/com/sk89q/util/ReflectionUtil.java | 5 +- .../main/java/com/sk89q/util/StringUtil.java | 3 +- .../java/com/sk89q/util/yaml/YAMLNode.java | 240 ++-- .../java/com/sk89q/worldedit/EditSession.java | 318 +++-- .../com/sk89q/worldedit/LocalSession.java | 31 +- .../sk89q/worldedit/WorldEditManifest.java | 3 +- .../com/sk89q/worldedit/blocks/BaseItem.java | 3 +- .../worldedit/command/ApplyBrushCommands.java | 6 +- .../worldedit/command/BrushCommands.java | 1071 +++++++++-------- .../worldedit/command/ClipboardCommands.java | 137 +-- .../command/FlattenedClipboardTransform.java | 4 +- .../worldedit/command/GeneralCommands.java | 42 +- .../worldedit/command/GenerationCommands.java | 63 +- .../worldedit/command/HistorySubCommands.java | 161 ++- .../sk89q/worldedit/command/ListFilters.java | 10 +- .../worldedit/command/MethodCommands.java | 4 +- .../worldedit/command/RegionCommands.java | 143 +-- .../worldedit/command/SchematicCommands.java | 62 +- .../worldedit/command/SelectionCommands.java | 4 +- .../sk89q/worldedit/command/ToolCommands.java | 4 +- .../worldedit/command/ToolUtilCommands.java | 145 ++- .../worldedit/command/UtilityCommands.java | 97 +- .../worldedit/command/WorldEditCommands.java | 34 +- .../worldedit/command/tool/AreaPickaxe.java | 2 +- .../worldedit/command/tool/BrushTool.java | 2 +- .../command/tool/NavigationWand.java | 2 +- .../com/sk89q/worldedit/entity/Player.java | 29 +- .../event/extent/EditSessionEvent.java | 6 +- .../factory/parser/DefaultBlockParser.java | 2 +- .../extension/factory/parser/RichParser.java | 8 +- .../parser/mask/AdjacentMaskParser.java | 8 +- .../factory/parser/mask/AngleMaskParser.java | 7 +- .../parser/mask/DefaultMaskParser.java | 6 +- .../parser/mask/ExtremaMaskParser.java | 7 +- .../parser/mask/ROCAngleMaskParser.java | 7 +- .../factory/parser/mask/RadiusMaskParser.java | 4 +- .../parser/mask/SimplexMaskParser.java | 4 +- .../factory/parser/mask/WallMaskParser.java | 5 +- .../parser/pattern/RandomPatternParser.java | 4 +- .../TypeOrStateApplyingPatternParser.java | 24 +- .../extension/input/ParserContext.java | 24 +- .../platform/AbstractPlayerActor.java | 185 ++- .../extension/platform/Platform.java | 3 +- .../platform/PlatformCommandManager.java | 5 +- .../extension/platform/PlatformManager.java | 59 +- .../extension/platform/binding/Bindings.java | 6 +- .../platform/binding/ConsumeBindings.java | 6 +- .../platform/binding/PrimitiveBindings.java | 17 +- .../extent/AbstractDelegateExtent.java | 222 ++-- .../com/sk89q/worldedit/extent/Extent.java | 49 +- .../sk89q/worldedit/extent/InputExtent.java | 2 +- .../sk89q/worldedit/extent/MaskingExtent.java | 4 +- .../extent/clipboard/BlockArrayClipboard.java | 22 +- .../worldedit/extent/clipboard/Clipboard.java | 8 +- .../clipboard/io/BuiltInClipboardFormat.java | 9 +- .../extent/clipboard/io/ClipboardFormat.java | 2 +- .../extent/clipboard/io/ClipboardFormats.java | 6 +- .../clipboard/io/FastSchematicReader.java | 39 +- .../clipboard/io/MCEditSchematicReader.java | 4 +- .../extent/clipboard/io/SchematicReader.java | 60 +- .../EntityNBTCompatibilityHandler.java | 1 + .../worldedit/extent/inventory/BlockBag.java | 14 +- .../extent/inventory/BlockBagExtent.java | 5 +- .../transform/BlockTransformExtent.java | 4 +- .../function/RegionMaskTestFunction.java | 3 +- .../function/generator/CavesGen.java | 38 +- .../generator/GardenPatchGenerator.java | 8 +- .../worldedit/function/generator/GenBase.java | 3 +- .../worldedit/function/generator/OreGen.java | 3 +- .../function/generator/SchemGen.java | 4 +- .../function/mask/AbstractExtentMask.java | 3 +- .../worldedit/function/mask/AbstractMask.java | 1 + .../worldedit/function/mask/BlockMask.java | 3 +- .../function/mask/BlockMaskBuilder.java | 113 +- .../function/mask/BlockTypeMask.java | 4 +- .../function/mask/MaskIntersection.java | 36 +- .../operation/BackwardsExtentBlockCopy.java | 2 +- .../function/operation/ChangeSetExecutor.java | 6 +- .../function/operation/ForwardExtentCopy.java | 7 +- .../function/pattern/RandomPattern.java | 4 +- .../function/pattern/WaterloggedRemover.java | 4 +- .../function/visitor/BreadthFirstSearch.java | 4 +- .../worldedit/function/visitor/ScanChunk.java | 191 +-- .../sk89q/worldedit/history/UndoContext.java | 3 +- .../history/changeset/ChangeSet.java | 13 +- .../internal/anvil/ChunkDeleter.java | 71 +- .../internal/anvil/ChunkDeletionInfo.java | 4 +- .../internal/block/BlockStateIdAccess.java | 5 +- .../internal/command/CommandArgParser.java | 3 + .../worldedit/internal/cui/CUIRegion.java | 20 +- .../internal/cui/ServerCUIHandler.java | 8 +- .../expression/ExpressionEnvironment.java | 5 + .../internal/expression/ExpressionHelper.java | 5 +- .../internal/expression/Functions.java | 6 +- .../expression/invoke/CompilingVisitor.java | 12 +- .../internal/registry/AbstractFactory.java | 4 +- .../sk89q/worldedit/math/BlockVector2.java | 2 +- .../sk89q/worldedit/math/MutableVector3.java | 136 +-- .../worldedit/math/convolution/HeightMap.java | 2 + .../worldedit/regions/CylinderRegion.java | 1 - .../worldedit/regions/RegionSelector.java | 6 +- .../registry/state/DirectionalProperty.java | 4 +- .../registry/state/IntegerProperty.java | 2 +- .../registry/state/PropertyGroup.java | 12 +- .../worldedit/registry/state/PropertyKey.java | 16 +- .../scripting/NashornCraftScriptEngine.java | 4 +- .../worldedit/session/ClipboardHolder.java | 2 + .../worldedit/session/request/Request.java | 39 +- .../com/sk89q/worldedit/util/Direction.java | 10 +- .../com/sk89q/worldedit/util/Location.java | 32 +- .../worldedit/util/collection/BlockMap.java | 5 +- .../util/collection/LocatedBlockList.java | 3 +- .../worldedit/util/eventbus/EventHandler.java | 4 +- .../util/eventbus/MethodEventHandler.java | 15 +- .../util/formatting/component/CodeFormat.java | 2 +- .../formatting/component/ErrorFormat.java | 2 +- .../formatting/component/PaginationBox.java | 2 +- .../formatting/component/SubtleFormat.java | 2 +- .../util/function/LevenshteinDistance.java | 2 +- .../util/io/file/ArchiveNioSupports.java | 2 +- .../util/logging/DynamicStreamHandler.java | 15 +- .../sk89q/worldedit/world/AbstractWorld.java | 3 +- .../com/sk89q/worldedit/world/NullWorld.java | 2 +- .../sk89q/worldedit/world/RegenOptions.java | 4 +- .../worldedit/world/block/BaseBlock.java | 12 +- .../sk89q/worldedit/world/block/BlockID.java | 2 +- .../worldedit/world/block/BlockState.java | 29 +- .../world/block/BlockStateHolder.java | 20 +- .../worldedit/world/block/BlockType.java | 2 +- .../world/block/BlockTypeSwitchBuilder.java | 4 +- .../worldedit/world/block/BlockTypeUtil.java | 86 +- .../world/block/BlockTypesCache.java | 26 +- .../worldedit/world/block/CompoundInput.java | 5 +- .../worldedit/world/chunk/AnvilChunk.java | 23 +- .../worldedit/world/chunk/AnvilChunk13.java | 4 +- .../world/fluid/FluidCategories.java | 3 +- .../worldedit/world/fluid/FluidTypes.java | 3 +- .../world/registry/BlockMaterial.java | 6 +- .../world/registry/BlockRegistry.java | 2 +- .../world/registry/EntityRegistry.java | 2 +- .../world/registry/LegacyMapper.java | 22 +- .../worldedit/world/snapshot/Snapshot.java | 14 +- .../world/snapshot/SnapshotRestore.java | 3 +- .../snapshot/experimental/SnapshotInfo.java | 20 +- .../experimental/SnapshotRestore.java | 3 +- .../experimental/fs/FolderSnapshot.java | 3 +- .../worldedit/world/storage/ChunkStore.java | 8 + .../world/storage/ChunkStoreHelper.java | 4 +- .../world/storage/FileLegacyChunkStore.java | 8 +- .../world/storage/FileMcRegionChunkStore.java | 8 +- .../storage/TrueZipLegacyChunkStore.java | 16 +- .../storage/TrueZipMcRegionChunkStore.java | 27 +- .../main/java/net/jpountz/util/Native.java | 10 +- worldedit-core/src/main/resources/cs_adv.js | 10 +- .../src/main/resources/lang/strings.json | 1 - 393 files changed, 6537 insertions(+), 4700 deletions(-) rename worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/{ChunkListener_9.java => ChunkListener9.java} (96%) delete mode 100644 worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/ChunkListener_8Plus.java diff --git a/README.md b/README.md index 72bee092b..2ef4aa97f 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,50 @@ -
- -
- ---- - -FAWE is a fork of WorldEdit that has huge speed and memory improvements and considerably more features - -## Links - -* [Spigot Page](https://www.spigotmc.org/threads/fast-async-worldedit.100104/) -* [Discord](https://discord.gg/KxkjDVg) -* [Wiki](https://wiki.intellectualsites.com/FastAsyncWorldEdit/index) -* [Report Issue](https://github.com/IntellectualSites/FastAsyncWorldEdit/issues) -* [Crowdin](https://intellectualsites.crowdin.com/fastasyncworldedit) -* [JavaDocs](https://ci.athion.net/job/FastAsyncWorldEdit-1.16/javadoc/) - -## Downloads -### 1.15+ -* [Download](https://intellectualsites.github.io/download/fawe.html) -* [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-1.16/) - - -## Building -FAWE uses gradle to build -You can safely ignore `gradlew setupDecompWorkspace` if you are not planning to work on the forge side of FAWE. - -``` -$ gradlew setupDecompWorkspace -$ gradlew build -``` - -The jar is located in `worldedit-bukkit/build/libs/FastAsyncWorldEdit-1.16-###.jar` - -## Contributing -Have an idea for an optimization, or a cool feature? - - We will accept most PR's - - Let us know what you've tested / what may need further testing - - If you need any help, create a ticket or discuss on [Discord](https://discord.gg/KxkjDVg) - -## YourKit - - - - -Thank you to YourKit for supporting our product by providing us with their innovative and intelligent tools -for monitoring and profiling Java and .NET applications. -YourKit is the creator of YourKit Java Profiler, YourKit .NET Profiler, and YourKit YouMonitor ++ +
+ +--- + +FAWE is a fork of WorldEdit that has huge speed and memory improvements and considerably more features + +## Links + +* [Spigot Page](https://www.spigotmc.org/threads/fast-async-worldedit.100104/) +* [Discord](https://discord.gg/KxkjDVg) +* [Wiki](https://wiki.intellectualsites.com/FastAsyncWorldEdit/index) +* [Report Issue](https://github.com/IntellectualSites/FastAsyncWorldEdit/issues) +* [Crowdin](https://intellectualsites.crowdin.com/fastasyncworldedit) +* [JavaDocs](https://ci.athion.net/job/FastAsyncWorldEdit-1.16/javadoc/) + +## Downloads +### 1.15+ +* [Download](https://www.spigotmc.org/resources/fast-async-worldedit.13932/) +* [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-1.16/) + +Looking builds for older versions? Download them [here](https://intellectualsites.github.io/download/). + + +## Building +FAWE uses gradle to build +You can safely ignore `gradlew setupDecompWorkspace` if you are not planning to work on the forge side of FAWE. + +``` +$ gradlew setupDecompWorkspace +$ gradlew build +``` + +The jar is located in `worldedit-bukkit/build/libs/FastAsyncWorldEdit-1.16-###.jar` + +## Contributing +Have an idea for an optimization, or a cool feature? + - We will accept most PR's + - Let us know what you've tested / what may need further testing + - If you need any help, create a ticket or discuss on [Discord](https://discord.gg/KxkjDVg) + +## YourKit + + + + +Thank you to YourKit for supporting our product by providing us with their innovative and intelligent tools +for monitoring and profiling Java and .NET applications. +YourKit is the creator of YourKit Java Profiler, YourKit .NET Profiler, and YourKit YouMonitor diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index 47db67011..662e1c150 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -19,6 +19,7 @@ import org.gradle.kotlin.dsl.withType fun Project.applyPlatformAndCoreConfiguration() { applyCommonConfiguration() apply(plugin = "java") + apply(plugin = "eclipse") apply(plugin = "idea") apply(plugin = "maven") // apply(plugin = "checkstyle") diff --git a/config/checkstyle/checkstyle-suppression.xml b/config/checkstyle/checkstyle-suppression.xml index a48ff1f81..6e77e27e7 100644 --- a/config/checkstyle/checkstyle-suppression.xml +++ b/config/checkstyle/checkstyle-suppression.xml @@ -10,4 +10,13 @@+ * The virtual world will be displayed inside the current world. Block/Chunk/Movement packets + * need to be handled properly. + *
*/ public class CFIPacketListener implements Listener { @@ -122,7 +119,9 @@ public class CFIPacketListener implements Listener { protocolmanager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.MAP_CHUNK) { @Override public void onPacketSending(PacketEvent event) { - if (!event.isServerPacket() || FaweCache.IMP.CHUNK_FLAG.get().get()) return; + if (!event.isServerPacket() || FaweCache.IMP.CHUNK_FLAG.get().get()) { + return; + } VirtualWorld gen = getGenerator(event); if (gen != null) { BlockVector3 origin = gen.getOrigin().toBlockPoint(); @@ -147,7 +146,9 @@ public class CFIPacketListener implements Listener { protocolmanager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.ENTITY_VELOCITY) { @Override public void onPacketSending(PacketEvent event) { - if (!event.isServerPacket()) return; + if (!event.isServerPacket()) { + return; + } Player player = event.getPlayer(); Location pos = player.getLocation(); @@ -172,7 +173,9 @@ public class CFIPacketListener implements Listener { protocolmanager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.POSITION) { @Override public void onPacketSending(PacketEvent event) { - if (!event.isServerPacket()) return; + if (!event.isServerPacket()) { + return; + } Player player = event.getPlayer(); Location pos = player.getLocation(); @@ -202,7 +205,9 @@ public class CFIPacketListener implements Listener { protocolmanager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.MULTI_BLOCK_CHANGE) { @Override public void onPacketSending(PacketEvent event) { - if (!event.isServerPacket()) return; + if (!event.isServerPacket()) { + return; + } VirtualWorld gen = getGenerator(event); if (gen != null) { @@ -260,11 +265,13 @@ public class CFIPacketListener implements Listener { private VirtualWorld getGenerator(Player player) { BukkitPlayer bukkitPlayer = BukkitAdapter.adapt(player); VirtualWorld vw = bukkitPlayer.getSession().getVirtualWorld(); - if (vw != null) return vw; + if (vw != null) { + return vw; + } // CFICommands.CFISettings settings = bukkitPlayer.getMeta("CFISettings"); -// if (settings != null && settings.hasGenerator() && settings.getGenerator().hasPacketViewer()) { -// return settings.getGenerator(); -// } + // if (settings != null && settings.hasGenerator() && settings.getGenerator().hasPacketViewer()) { + // return settings.getGenerator(); + // } return null; } @@ -272,7 +279,9 @@ public class CFIPacketListener implements Listener { PacketContainer packet = event.getPacket(); StructureModifier