From 2d0c434654b797b71e9a0d00004b3b79f3a4c5e7 Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Mon, 24 May 2021 13:50:30 +0200 Subject: [PATCH] style: improve code style (#4702) * cleanup imports * update copyrights * remove empty JavaDoc * add missing curly braces * fix whitespaces * fix lines longer than 175 characters Co-authored-by: Josephine Rueckert --- .../terasology/engine/MapWorldProvider.java | 17 +- .../engine/TerasologyTestingEnvironment.java | 10 +- .../WorldProvidingHeadlessEnvironment.java | 17 +- .../config/flexible/TestAutoConfig.java | 2 +- .../testUtil/WorldProviderCoreStub.java | 19 +- .../propagation/StubPropagatorWorldView.java | 19 +- .../unittest/stubs/EntityRefComponent.java | 2 - .../stubs/ForceBlockActiveComponent.java | 2 - .../unittest/stubs/GetterSetterComponent.java | 2 - .../unittest/stubs/IntegerComponent.java | 2 - .../unittest/stubs/MappedTypeComponent.java | 2 - .../unittest/stubs/OwnerComponent.java | 2 - .../stubs/RetainedOnBlockChangeComponent.java | 2 - .../stubs/UnsupportedTypeComponent.java | 2 - .../config/flexible/AutoConfigTest.java | 19 +- .../NumberRangeConstraintTest.java | 17 +- .../terasology/documentation/ApiScraper.java | 17 +- .../documentation/BindingScraper.java | 17 +- .../apiScraper/ApiComparator.java | 17 +- .../documentation/apiScraper/ApiSaver.java | 17 +- .../apiScraper/CompleteApiScraper.java | 17 +- .../apiScraper/util/ApiMethod.java | 17 +- .../engine/ComponentSystemManagerTest.java | 3 + .../entitySystem/PojoEntityManagerTest.java | 2 - .../entitySystem/PojoEventSystemTests.java | 2 - .../entitySystem/PojoPrefabManagerTest.java | 2 - .../engine/entitySystem/PrefabTest.java | 2 - .../metadata/ComponentMetadataTest.java | 2 - .../metadata/FieldMetadataTest.java | 7 +- .../internal/NetworkOwnershipTest.java | 2 - .../persistence/ComponentSerializerTest.java | 2 - .../persistence/EntitySerializerTest.java | 2 - .../serializers/TypeSerializerTest.java | 14 +- .../serializers/VectorTypeSerializerTest.java | 2 - .../entitySystem/BaseEntityRefTest.java | 2 +- .../entitySystem/OwnershipHelperTest.java | 4 +- .../entitySystem/PojoEntityPoolTest.java | 4 +- .../metadata/OwnedCollectionComponent.java | 17 +- .../internal/MetadataBuilderTest.java | 19 +- .../terasology/fixtures/TestBlockManager.java | 2 +- .../terasology/fixtures/TestChunkStore.java | 2 +- .../fixtures/TestStorageManager.java | 2 +- .../fixtures/TestWorldGenerator.java | 2 +- .../i18n/TranslationFormatTests.java | 4 +- .../terasology/identity/CertificateTests.java | 21 +-- .../identity/MasterSecretGeneratorTests.java | 21 +-- .../BigIntegerBase64SerializerTest.java | 17 +- .../ServiceApiRequestTests.java | 17 +- .../logic/behavior/CountCallsTest.java | 17 +- .../logic/behavior/CounterTest.java | 17 +- .../logic/behavior/DynamicSelectorTest.java | 17 +- .../terasology/logic/behavior/Example.java | 25 +-- .../logic/behavior/ParallelTest.java | 17 +- .../logic/behavior/SelectorTest.java | 17 +- .../logic/behavior/SequenceTest.java | 17 +- .../KinematicCharacterMoverTest.java | 2 - .../terasology/logic/console/ConsoleTest.java | 17 +- .../logic/location/LocationComponentTest.java | 2 - .../math/Diamond3iIteratorTest.java | 27 +-- .../org/terasology/math/DirectionTests.java | 17 +- .../java/org/terasology/math/IntMathTest.java | 21 +-- .../org/terasology/math/IntegerRangeTest.java | 17 +- .../org/terasology/math/RotationTest.java | 19 +- .../java/org/terasology/math/SideTest.java | 19 +- .../org/terasology/network/TestNetwork.java | 19 +- .../particles/ParticlePoolTest.java | 17 +- .../updating/ParticleUpdaterImplTest.java | 17 +- .../persistence/EntityDataJSONFormatTest.java | 19 +- .../persistence/TemplateEngineTest.java | 17 +- .../persistence/WorldSerializerTest.java | 17 +- .../GamePreviewImageProviderTest.java | 17 +- .../gson/GsonTypeHandlerAdapterTest.java | 31 ++- ...nTypeHandlerLibraryAdapterFactoryTest.java | 25 +-- .../PolymorphicTypeAdapterFactoryTest.java | 61 +++--- .../mathTypes/IntegerRangeHandlerTest.java | 17 +- .../terasology/reflection/TypeInfoTest.java | 17 +- .../copy/strategy/MapCopyStrategyTest.java | 19 +- .../reflect/ByteCodeReflectFactoryTest.java | 2 - .../reflect/ConstructorLibraryTest.java | 4 +- .../reflection/reflect/PrivateComponent.java | 19 +- .../terasology/registry/CoreRegistryTest.java | 17 +- .../registry/InjectionHelperTest.java | 17 +- .../rendering/FontUnderlineTest.java | 17 +- .../rendering/animation/AnimationTest.java | 17 +- .../assets/texture/AWTTextureFormatTest.java | 17 +- .../texture/TextureAssetResolverTest.java | 17 +- .../texture/TextureDataFactoryTest.java | 19 +- .../assets/texture/TextureUtilTest.java | 2 - .../dag/RenderTaskListGeneratorTest.java | 17 +- .../org/terasology/rendering/dag/SetName.java | 17 +- .../rendering/nui/layouts/CardLayoutTest.java | 17 +- .../nui/layouts/ColumnLayoutTest.java | 23 +-- .../rendering/nui/layouts/RowLayoutTest.java | 17 +- .../nui/layouts/ZoomableLayoutTest.java | 80 ++++---- .../HTMLLikeParserParameterizedTest.java | 17 +- .../data/basic/HTMLLikeParserTest.java | 17 +- .../browser/data/html/HTMLParserTest.java | 17 +- .../nui/widgets/treeView/GenericTreeTest.java | 17 +- .../treeView/JsonTreeConverterTest.java | 17 +- .../utilities/CamelCaseMatcherTest.java | 17 +- .../utilities/MersenneRandomTest.java | 17 +- .../org/terasology/utilities/NoiseTest.java | 17 +- .../utilities/ReflectionUtilTest.java | 67 +++---- .../terasology/utilities/WhiteNoiseTest.java | 17 +- .../collection/CircularBufferTest.java | 19 +- .../utilities/time/DateTimeHelperTest.java | 17 +- .../utilities/tree/SpaceTreeTest.java | 17 +- .../java/org/terasology/world/ChunkTest.java | 17 +- .../Zones/LayeredZoneRegionFunctionTest.java | 17 +- .../org/terasology/world/Zones/ZoneTest.java | 19 +- .../world/block/BlockRegionTest.java | 2 +- .../world/block/shape/BlockShapeTest.java | 17 +- .../pipeline/ChunkProcessingPipelineTest.java | 2 +- .../world/generation/WorldBuilderTest.java | 17 +- .../facets/BaseBooleanFacetTest.java | 17 +- .../generation/facets/BaseFieldFacetTest.java | 17 +- .../facets/BaseObjectFacetTest.java | 17 +- .../generation/facets/BooleanFacetTest.java | 17 +- .../generation/facets/FieldFacetTest.java | 17 +- .../generation/facets/ObjectFacetTest.java | 17 +- .../facets/SparseBooleanFacetTest.java | 17 +- .../facets/SparseFieldFacetTest.java | 17 +- .../facets/SparseObjectFacetTest.java | 17 +- .../BetweenChunkPropagationTest.java | 2 +- .../propagation/BulkLightPropagationTest.java | 17 +- .../BulkSunlightPropagationTest.java | 21 +-- .../terasology/world/time/WorldTimeTest.java | 17 +- engine-tests/src/test/resources/logback.xml | 3 + .../reflectFactory/GetterSetterComponent.java | 2 - .../engine/audio/AudioEndListener.java | 17 +- .../terasology/engine/audio/AudioManager.java | 17 +- .../org/terasology/engine/audio/Sound.java | 17 +- .../terasology/engine/audio/StaticSound.java | 17 +- .../engine/audio/StaticSoundData.java | 17 +- .../engine/audio/StreamingSound.java | 17 +- .../engine/audio/StreamingSoundData.java | 17 +- .../audio/events/AbstractPlaySoundEvent.java | 17 +- .../engine/audio/events/PlaySoundEvent.java | 17 +- .../audio/events/PlaySoundForOwnerEvent.java | 17 +- .../engine/audio/events/package-info.java | 17 +- .../engine/audio/formats/OggReader.java | 17 +- .../engine/audio/formats/OggSoundFormat.java | 19 +- .../audio/formats/OggStreamingSoundData.java | 21 +-- .../formats/OggStreamingSoundFormat.java | 19 +- .../audio/nullAudio/NullAudioManager.java | 17 +- .../engine/audio/nullAudio/NullSound.java | 17 +- .../audio/nullAudio/NullStreamingSound.java | 17 +- .../engine/audio/openAL/BaseSoundPool.java | 17 +- .../engine/audio/openAL/BaseSoundSource.java | 17 +- .../engine/audio/openAL/OpenALException.java | 17 +- .../engine/audio/openAL/OpenALManager.java | 17 +- .../engine/audio/openAL/SoundPool.java | 17 +- .../engine/audio/openAL/SoundSource.java | 17 +- .../audio/openAL/staticSound/OpenALSound.java | 17 +- .../openAL/staticSound/OpenALSoundPool.java | 17 +- .../openAL/staticSound/OpenALSoundSource.java | 21 +-- .../streamingSound/OpenALStreamingSound.java | 3 +- .../OpenALStreamingSoundPool.java | 17 +- .../OpenALStreamingSoundSource.java | 17 +- .../terasology/engine/audio/package-info.java | 17 +- .../engine/audio/system/AudioSystem.java | 18 +- .../terasology/engine/config/AudioConfig.java | 2 +- .../terasology/engine/config/BindsConfig.java | 17 +- .../engine/config/ControllerConfig.java | 17 +- .../config/IdentityStorageServiceConfig.java | 17 +- .../terasology/engine/config/InputConfig.java | 17 +- .../config/MetricsUserPermissionConfig.java | 17 +- .../engine/config/ModuleConfig.java | 19 +- .../engine/config/NUIEditorConfig.java | 21 +-- .../engine/config/NetworkConfig.java | 19 +- .../engine/config/PermissionConfig.java | 17 +- .../engine/config/RenderingConfig.java | 17 +- .../engine/config/RenderingDebugConfig.java | 19 +- .../engine/config/SecurityConfig.java | 21 +-- .../engine/config/SelectModulesConfig.java | 17 +- .../terasology/engine/config/ServerInfo.java | 17 +- .../engine/config/TelemetryConfig.java | 17 +- .../engine/config/UniverseConfig.java | 17 +- .../engine/config/WebBrowserConfig.java | 17 +- .../engine/config/WorldGenerationConfig.java | 17 +- .../config/facade/BindsConfiguration.java | 3 + .../config/facade/BindsConfigurationImpl.java | 3 + .../facade/InputDeviceConfiguration.java | 3 + .../facade/InputDeviceConfigurationImpl.java | 3 + .../config/facade/TelemetryConfiguration.java | 17 +- .../facade/TelemetryConfigurationImpl.java | 17 +- .../engine/config/flexible/AutoConfig.java | 2 +- .../flexible/AutoConfigTypeHandler.java | 2 +- .../AutoConfigTypeHandlerFactory.java | 2 +- .../engine/config/flexible/Setting.java | 17 +- .../flexible/SettingChangeListener.java | 17 +- .../constraints/NumberRangeConstraint.java | 17 +- .../constraints/SettingConstraint.java | 17 +- .../flexible/constraints/package-info.java | 17 +- .../terasology/engine/context/Context.java | 17 +- .../engine/context/internal/ContextImpl.java | 17 +- .../engine/context/internal/MockContext.java | 17 +- .../terasology/engine/core/EngineTime.java | 2 - .../engine/core/StandardGameStatus.java | 2 - .../engine/core/TerasologyEngine.java | 94 +++++----- .../core/bootstrap/ClassMetaLibrary.java | 17 +- .../core/bootstrap/ClassMetaLibraryImpl.java | 17 +- .../core/bootstrap/EntitySystemSetupUtil.java | 5 +- .../engine/core/internal/TimeBase.java | 17 +- .../engine/core/internal/TimeLwjgl.java | 17 +- .../engine/core/modes/GameState.java | 17 +- .../engine/core/modes/LoadProcess.java | 19 +- .../core/modes/SingleStepLoadProcess.java | 19 +- .../engine/core/modes/StateIngame.java | 17 +- .../engine/core/modes/StateLoading.java | 2 +- .../engine/core/modes/StateMainMenu.java | 2 +- .../core/modes/StepBasedLoadProcess.java | 17 +- .../core/modes/VariableStepLoadProcess.java | 17 +- .../loadProcesses/AwaitCharacterSpawn.java | 17 +- .../AwaitedLocalCharacterSpawnEvent.java | 17 +- .../CreateRemoteWorldEntity.java | 17 +- .../loadProcesses/CreateWorldEntity.java | 19 +- .../EnsureSaveGameConsistency.java | 17 +- .../InitialiseBlockTypeEntities.java | 17 +- .../InitialiseCommandSystem.java | 17 +- .../InitialiseComponentSystemManager.java | 17 +- .../loadProcesses/InitialiseEntitySystem.java | 19 +- .../loadProcesses/InitialiseGraphics.java | 2 - .../loadProcesses/InitialisePhysics.java | 19 +- .../InitialiseRecordAndReplay.java | 17 +- .../loadProcesses/InitialiseRemoteWorld.java | 2 +- .../loadProcesses/InitialiseSystems.java | 19 +- .../modes/loadProcesses/InitialiseWorld.java | 12 +- .../InitialiseWorldGenerator.java | 17 +- .../core/modes/loadProcesses/JoinServer.java | 17 +- .../modes/loadProcesses/LoadEntities.java | 17 +- .../loadProcesses/LoadExtraBlockData.java | 17 +- .../core/modes/loadProcesses/LoadPrefabs.java | 17 +- .../LoadingChunkEventSystem.java | 17 +- .../modes/loadProcesses/PostBeginSystems.java | 17 +- .../modes/loadProcesses/PreBeginSystems.java | 17 +- .../modes/loadProcesses/PrepareWorld.java | 19 +- .../loadProcesses/ProcessBlockPrefabs.java | 19 +- .../loadProcesses/RegisterBlockFamilies.java | 17 +- .../modes/loadProcesses/RegisterBlocks.java | 2 - .../loadProcesses/RegisterInputSystem.java | 19 +- .../modes/loadProcesses/RegisterMods.java | 19 +- .../modes/loadProcesses/RegisterSystems.java | 19 +- .../modes/loadProcesses/SetupLocalPlayer.java | 2 - .../loadProcesses/SetupRemotePlayer.java | 19 +- .../core/modes/loadProcesses/StartServer.java | 19 +- .../DependencyResolutionFailedException.java | 17 +- .../core/module/ExtraDataModuleExtension.java | 17 +- .../engine/core/module/ModuleContext.java | 19 +- .../module/ModuleDownloadListGenerator.java | 17 +- .../engine/core/module/ModuleExtension.java | 17 +- .../engine/core/module/ModuleInputStream.java | 17 +- .../core/module/ModuleInstallManager.java | 17 +- .../core/module/ModuleListDownloader.java | 17 +- .../core/module/ModuleOutputStream.java | 17 +- .../core/module/RemoteModuleExtension.java | 17 +- .../core/module/StandardModuleExtension.java | 17 +- .../engine/core/module/UriUtil.java | 19 +- .../rendering/RenderingModuleRegistry.java | 17 +- .../core/module/rendering/package-info.java | 17 +- .../engine/core/subsystem/DisplayDevice.java | 17 +- .../core/subsystem/DisplayDeviceInfo.java | 2 +- .../core/subsystem/EngineSubsystem.java | 17 +- .../subsystem/RenderingSubsystemFactory.java | 17 +- .../engine/core/subsystem/Resolution.java | 17 +- .../subsystem/common/CommandSubsystem.java | 21 +-- .../core/subsystem/common/GameSubsystem.java | 21 +-- .../subsystem/common/MonitoringSubsystem.java | 17 +- .../subsystem/common/NetworkSubsystem.java | 21 +-- .../subsystem/common/PhysicsSubsystem.java | 21 +-- .../subsystem/common/TelemetrySubSystem.java | 31 ++- .../core/subsystem/common/ThreadManager.java | 17 +- .../common/ThreadManagerSubsystem.java | 19 +- .../core/subsystem/common/TimeSubsystem.java | 17 +- .../common/WorldGenerationSubsystem.java | 21 +-- .../hibernation/HibernationManager.java | 21 +-- .../hibernation/HibernationSubsystem.java | 21 +-- .../core/subsystem/config/BindsManager.java | 3 + .../core/subsystem/config/BindsSubsystem.java | 17 +- .../subsystem/headless/HeadlessGraphics.java | 17 +- .../subsystem/headless/HeadlessInput.java | 17 +- .../subsystem/headless/HeadlessTimer.java | 17 +- .../headless/assets/HeadlessMaterial.java | 17 +- .../headless/assets/HeadlessMesh.java | 17 +- .../headless/assets/HeadlessShader.java | 17 +- .../headless/assets/HeadlessSkeletalMesh.java | 17 +- .../headless/assets/HeadlessTexture.java | 17 +- .../device/HeadlessDisplayDevice.java | 17 +- .../headless/device/HeadlessResolution.java | 17 +- .../subsystem/headless/device/TimeSystem.java | 17 +- .../mode/HeadlessStateChangeListener.java | 17 +- .../headless/mode/StateHeadlessSetup.java | 17 +- .../renderer/HeadlessCanvasRenderer.java | 2 +- .../HeadlessRenderingSubsystemFactory.java | 17 +- .../headless/renderer/NullCamera.java | 17 +- .../renderer/ShaderManagerHeadless.java | 17 +- .../subsystem/lwjgl/BaseLwjglSubsystem.java | 21 +-- .../core/subsystem/lwjgl/DebugCallback.java | 17 +- .../subsystem/lwjgl/GLFWErrorCallback.java | 3 + .../core/subsystem/lwjgl/Lwjgl2Sync.java | 2 +- .../subsystem/lwjgl/LwjglDisplayDevice.java | 17 +- .../core/subsystem/lwjgl/LwjglGraphics.java | 2 +- .../subsystem/lwjgl/LwjglGraphicsManager.java | 17 +- .../lwjgl/LwjglGraphicsProcessing.java | 2 +- .../subsystem/lwjgl/LwjglGraphicsUtil.java | 21 +-- .../core/subsystem/lwjgl/LwjglInput.java | 2 +- .../lwjgl/LwjglRenderingSubsystemFactory.java | 17 +- .../core/subsystem/lwjgl/LwjglResolution.java | 2 +- .../core/subsystem/lwjgl/LwjglTimer.java | 17 +- .../subsystem/openvr/OpenVRControllers.java | 17 +- .../core/subsystem/openvr/OpenVRInput.java | 17 +- .../rendering/ModuleRenderingSubsystem.java | 17 +- .../engine/entitySystem/Component.java | 17 +- .../entitySystem/ComponentContainer.java | 19 +- .../MutableComponentContainer.java | 17 +- .../terasology/engine/entitySystem/Owns.java | 17 +- .../entitySystem/entity/EntityManager.java | 17 +- .../entitySystem/entity/EntityPool.java | 17 +- .../engine/entitySystem/entity/EntityRef.java | 17 +- .../entitySystem/entity/EntityStore.java | 17 +- .../entity/LowLevelEntityManager.java | 17 +- .../entitySystem/entity/SectorManager.java | 17 +- .../entity/internal/BaseEntityRef.java | 19 +- .../entity/internal/ComponentTable.java | 17 +- .../entity/internal/DefaultRefStrategy.java | 19 +- .../entity/internal/EngineEntityPool.java | 17 +- .../entity/internal/EngineSectorManager.java | 17 +- .../internal/EntityChangeSubscriber.java | 17 +- .../internal/EntityDestroySubscriber.java | 17 +- .../entity/internal/EntityInfoComponent.java | 17 +- .../entity/internal/EntityIterator.java | 17 +- .../entity/internal/EntityScope.java | 17 +- .../entity/internal/NullEntityRef.java | 17 +- .../entity/internal/OwnershipHelper.java | 19 +- .../entity/internal/PojoEntityPool.java | 17 +- .../entity/internal/PojoEntityRef.java | 19 +- .../entity/internal/PojoSectorManager.java | 17 +- .../entity/internal/RefStrategy.java | 17 +- .../entity/internal/WorldManager.java | 17 +- .../BeforeDeactivateComponent.java | 17 +- .../lifecycleEvents/BeforeEntityCreated.java | 17 +- .../BeforeRemoveComponent.java | 17 +- .../lifecycleEvents/OnActivatedComponent.java | 17 +- .../lifecycleEvents/OnAddedComponent.java | 17 +- .../lifecycleEvents/OnChangedComponent.java | 17 +- .../entity/lifecycleEvents/package-info.java | 17 +- .../entitySystem/entity/package-info.java | 17 +- .../event/AbstractConsumableEvent.java | 19 +- ...bstractConsumableValueModifiableEvent.java | 17 +- .../event/AbstractValueModifiableEvent.java | 17 +- .../entitySystem/event/BeforeAfterEvent.java | 2 +- .../entitySystem/event/ConsumableEvent.java | 17 +- .../engine/entitySystem/event/Event.java | 17 +- .../entitySystem/event/EventPriority.java | 19 +- .../entitySystem/event/PendingEvent.java | 17 +- .../entitySystem/event/ReceiveEvent.java | 17 +- .../event/internal/EventReceiver.java | 17 +- .../event/internal/EventSystem.java | 2 +- .../event/internal/EventSystemImpl.java | 16 +- .../entitySystem/event/package-info.java | 17 +- .../metadata/ComponentFieldMetadata.java | 26 +-- .../metadata/ComponentLibrary.java | 17 +- .../metadata/ComponentMetadata.java | 17 +- .../entitySystem/metadata/EventLibrary.java | 17 +- .../entitySystem/metadata/EventMetadata.java | 19 +- .../entitySystem/metadata/MetadataUtil.java | 19 +- .../metadata/NetworkEventType.java | 19 +- .../metadata/ReplicatedFieldMetadata.java | 17 +- .../entitySystem/metadata/package-info.java | 17 +- .../engine/entitySystem/package-info.java | 17 +- .../engine/entitySystem/prefab/Prefab.java | 17 +- .../entitySystem/prefab/PrefabData.java | 19 +- .../entitySystem/prefab/PrefabManager.java | 17 +- .../prefab/internal/PojoPrefab.java | 19 +- .../prefab/internal/PojoPrefabManager.java | 17 +- .../prefab/internal/PrefabDeltaFormat.java | 2 - .../entitySystem/prefab/package-info.java | 17 +- .../sectors/LoadedSectorUpdateEvent.java | 17 +- .../sectors/SectorEntityLoad.java | 17 +- .../sectors/SectorEntityUnload.java | 17 +- .../sectors/SectorRegionComponent.java | 17 +- .../sectors/SectorSimulationComponent.java | 17 +- .../sectors/SectorSimulationEvent.java | 17 +- .../sectors/SectorSimulationSystem.java | 17 +- .../entitySystem/sectors/SectorUtil.java | 17 +- .../systems/BaseComponentSystem.java | 17 +- .../entitySystem/systems/ComponentSystem.java | 17 +- .../entitySystem/systems/RegisterMode.java | 2 +- .../entitySystem/systems/RegisterSystem.java | 17 +- .../entitySystem/systems/RenderSystem.java | 17 +- .../systems/UpdateSubscriberSystem.java | 17 +- .../systems/internal/DoNotAutoRegister.java | 17 +- .../entitySystem/systems/package-info.java | 17 +- .../java/org/terasology/engine/game/Game.java | 19 +- .../terasology/engine/game/GameManifest.java | 19 +- .../identity/BadEncryptedDataException.java | 17 +- .../engine/identity/CertificateGenerator.java | 17 +- .../engine/identity/CertificatePair.java | 17 +- .../engine/identity/ClientIdentity.java | 17 +- .../engine/identity/IdentityConstants.java | 17 +- .../identity/PrivateIdentityCertificate.java | 17 +- .../identity/PublicIdentityCertificate.java | 17 +- .../engine/identity/SecretGenerator.java | 17 +- .../storageServiceClient/APISession.java | 17 +- .../identity/storageServiceClient/Action.java | 17 +- .../BigIntegerBase64Serializer.java | 17 +- .../storageServiceClient/HttpMethod.java | 17 +- .../storageServiceClient/IdentityBundle.java | 17 +- .../IdentityConflict.java | 17 +- .../IdentityConflictSolution.java | 17 +- .../InitializeFromTokenAction.java | 4 +- .../storageServiceClient/LoginAction.java | 19 +- .../storageServiceClient/LogoutAction.java | 19 +- .../PutIdentityAction.java | 19 +- .../ServiceApiRequest.java | 17 +- .../StatusMessageTranslator.java | 17 +- .../StorageServiceException.java | 17 +- .../StorageServiceWorker.java | 46 ++--- .../StorageServiceWorkerStatus.java | 17 +- .../SyncIdentitiesAction.java | 19 +- .../engine/input/BindAxisEvent.java | 2 - .../engine/input/BindButtonEvent.java | 2 - .../engine/input/BindableButton.java | 2 - .../engine/input/RegisterBindAxis.java | 2 - .../engine/input/RegisterBindButton.java | 2 - .../engine/input/RegisterRealBindAxis.java | 2 - .../engine/input/SendEventMode.java | 2 - .../input/binds/general/ConsoleButton.java | 2 - .../input/binds/general/HideHUDButton.java | 2 - .../input/binds/interaction/AttackButton.java | 2 - .../input/binds/interaction/FrobButton.java | 2 - .../input/binds/inventory/UseItemButton.java | 2 - .../input/binds/movement/BackwardsButton.java | 2 - .../input/binds/movement/CrouchButton.java | 2 - .../binds/movement/CrouchModeButton.java | 2 - .../input/binds/movement/ForwardsButton.java | 2 - .../binds/movement/ForwardsMovementAxis.java | 2 - .../movement/ForwardsRealMovementAxis.java | 2 - .../input/binds/movement/JumpButton.java | 2 - .../binds/movement/LeftStrafeButton.java | 2 - .../binds/movement/RightStrafeButton.java | 2 - .../binds/movement/StrafeMovementAxis.java | 2 - .../movement/StrafeRealMovementAxis.java | 2 - .../ToggleSpeedPermanentlyButton.java | 2 - .../ToggleSpeedTemporarilyButton.java | 2 - .../binds/movement/VerticalMovementAxis.java | 2 - .../movement/VerticalRealMovementAxis.java | 2 - .../CameraTargetChangedEvent.java | 2 - .../cameraTarget/CameraTargetSystem.java | 2 - .../engine/input/events/AxisEvent.java | 2 - .../engine/input/events/ButtonEvent.java | 2 - .../engine/input/events/MouseWheelEvent.java | 2 - .../engine/input/internal/BindCommands.java | 2 - .../engine/logic/actions/ActionTarget.java | 2 - .../logic/actions/SpawnPrefabAction.java | 2 - .../actions/SpawnPrefabActionComponent.java | 2 - .../logic/ai/HierarchicalAIComponent.java | 2 - .../engine/logic/ai/SimpleAIComponent.java | 2 - .../engine/logic/ai/SimpleAISystem.java | 2 - .../logic/autoCreate/AutoCreateSystem.java | 2 - .../behavior/CollectiveBehaviorComponent.java | 2 +- .../logic/behavior/actions/SleepAction.java | 2 +- .../behavior/asset/BehaviorTreeData.java | 2 - .../logic/behavior/nui/BTEditorButton.java | 2 - .../behavior/nui/BehaviorEditorScreen.java | 2 - .../engine/logic/behavior/nui/PortList.java | 2 - .../characters/CharacterMoveInputEvent.java | 2 - .../characters/CharacterSoundComponent.java | 2 - .../characters/CharacterSoundSystem.java | 2 - .../logic/characters/CharacterSystem.java | 4 +- .../ClientCharacterPredictionSystem.java | 6 +- .../engine/logic/characters/MovementMode.java | 2 - .../characters/VisualCharacterSystem.java | 7 +- .../events/ActivationPredicted.java | 2 - .../characters/events/ActivationRequest.java | 2 - .../characters/events/AttackRequest.java | 2 - .../characters/events/CollisionEvent.java | 2 - .../characters/events/FootstepEvent.java | 2 - .../events/HorizontalCollisionEvent.java | 2 - .../logic/characters/events/JumpEvent.java | 2 - .../events/SetMovementModeEvent.java | 2 - .../events/VerticalCollisionEvent.java | 2 - .../interactions/InteractionSystem.java | 2 - .../InteractionTargetComponent.java | 2 - .../engine/logic/chat/ChatSystem.java | 2 - .../engine/logic/common/ActivateEvent.java | 2 - .../logic/common/DisplayNameComponent.java | 2 - .../logic/common/lifespan/LifespanSystem.java | 2 - .../engine/logic/console/Console.java | 2 - .../engine/logic/console/CoreMessageType.java | 2 - .../engine/logic/console/Message.java | 5 +- .../commandSystem/CommandParameter.java | 2 - .../commandSystem/MarkerParameters.java | 2 - .../console/commandSystem/MethodCommand.java | 31 +-- .../adapter/BlockFamilyAdapter.java | 2 - .../commandSystem/adapter/NameAdapter.java | 2 - .../adapter/ParameterAdapterManager.java | 2 - .../commandSystem/adapter/PrefabAdapter.java | 2 - .../adapter/PrimitiveAdapters.java | 2 - .../exceptions/CommandExecutionException.java | 2 - .../CommandInitializationException.java | 2 - .../CommandParameterParseException.java | 2 - .../suggesters/CommandNameSuggester.java | 2 - .../logic/console/ui/TabCompletionEngine.java | 2 - .../logic/console/ui/UICommandEntry.java | 2 - .../logic/debug/ChunkEventErrorLogger.java | 2 - .../delay/DelayedActionTriggeredEvent.java | 2 - .../delay/PeriodicActionTriggeredEvent.java | 2 - .../logic/health/BeforeDestroyEvent.java | 2 - .../engine/logic/location/Location.java | 2 - .../logic/players/DebugControlSystem.java | 25 +-- .../players/DecreaseViewDistanceButton.java | 2 - .../players/IncreaseViewDistanceButton.java | 2 - .../logic/players/LocalPlayerSystem.java | 37 ++-- .../ThirdPersonRemoteClientSystem.java | 159 ++++++++++------ .../players/event/RespawnRequestEvent.java | 2 - .../engine/math/Diamond3iIterable.java | 6 +- .../org/terasology/engine/math/Direction.java | 4 - .../engine/math/SpiralIterable.java | 2 +- .../engine/monitoring/Activity.java | 17 +- .../engine/monitoring/PerformanceMonitor.java | 17 +- .../engine/monitoring/ThreadActivity.java | 17 +- .../engine/monitoring/ThreadMonitor.java | 17 +- .../monitoring/chunk/ChunkMeshInfo.java | 17 +- .../engine/monitoring/chunk/ChunkMonitor.java | 17 +- .../monitoring/chunk/ChunkMonitorEntry.java | 20 +- .../monitoring/chunk/ChunkMonitorEvent.java | 17 +- .../monitoring/gui/AdvancedMonitor.java | 17 +- .../gui/ChunkMonitorDisplayEvent.java | 17 +- .../monitoring/gui/ChunkMonitorPanel.java | 17 +- .../gui/PerformanceMonitorPanel.java | 17 +- .../monitoring/gui/ThreadMonitorPanel.java | 17 +- .../engine/monitoring/impl/NullActivity.java | 17 +- .../impl/NullPerformanceMonitor.java | 19 +- .../monitoring/impl/NullThreadActivity.java | 19 +- .../impl/PerformanceMonitorImpl.java | 17 +- .../impl/PerformanceMonitorInternal.java | 17 +- .../monitoring/impl/SingleThreadMonitor.java | 17 +- .../impl/SingleThreadMonitorImpl.java | 17 +- .../impl/ThreadActivityInternal.java | 19 +- .../monitoring/impl/ThreadMonitorEvent.java | 17 +- .../engine/monitoring/package-info.java | 17 +- .../engine/network/BroadcastEvent.java | 17 +- .../org/terasology/engine/network/Client.java | 17 +- .../engine/network/ClientComponent.java | 17 +- .../engine/network/ClientInfoComponent.java | 17 +- .../engine/network/ClientPingSystem.java | 17 +- .../engine/network/ColorComponent.java | 17 +- .../engine/network/FieldReplicateType.java | 19 +- .../terasology/engine/network/JoinStatus.java | 19 +- .../engine/network/NetMetricSource.java | 17 +- .../engine/network/NetworkComponent.java | 19 +- .../engine/network/NetworkEvent.java | 17 +- .../network/NetworkEventSystemDecorator.java | 2 +- .../engine/network/NetworkMode.java | 17 +- .../engine/network/NetworkSystem.java | 17 +- .../engine/network/NoReplicate.java | 17 +- .../terasology/engine/network/OwnerEvent.java | 17 +- .../engine/network/PingService.java | 2 +- .../engine/network/PingStockComponent.java | 17 +- .../network/PingSubscriberComponent.java | 17 +- .../terasology/engine/network/Replicate.java | 17 +- .../engine/network/ReplicationCheck.java | 17 +- .../org/terasology/engine/network/Server.java | 19 +- .../engine/network/ServerEvent.java | 17 +- .../engine/network/ServerInfoMessage.java | 17 +- .../engine/network/ServerInfoService.java | 2 +- .../engine/network/ServerPingSystem.java | 17 +- .../engine/network/events/ConnectedEvent.java | 17 +- .../network/events/DisconnectedEvent.java | 17 +- .../network/events/PingFromClientEvent.java | 17 +- .../network/events/PingFromServerEvent.java | 17 +- .../network/events/SubscribePingEvent.java | 17 +- .../network/events/UnSubscribePingEvent.java | 17 +- .../engine/network/events/package-info.java | 17 +- .../exceptions/HostingFailedException.java | 17 +- .../network/internal/AbstractClient.java | 17 +- .../network/internal/ClientHandler.java | 17 +- .../internal/ClientHandshakeHandler.java | 2 +- .../network/internal/HandshakeCommon.java | 17 +- .../network/internal/JoinStatusImpl.java | 19 +- .../internal/MetricRecordingHandler.java | 17 +- .../engine/network/internal/NetEntityRef.java | 17 +- .../internal/NetworkClientRefStrategy.java | 19 +- .../network/internal/NetworkEntitySystem.java | 17 +- .../network/internal/NetworkSystemImpl.java | 1 - .../internal/ServerConnectionHandler.java | 6 +- .../network/internal/ServerHandler.java | 17 +- .../internal/ServerHandshakeHandler.java | 2 +- .../internal/ServerInfoMessageImpl.java | 17 +- .../internal/ServerInfoRequestHandler.java | 17 +- .../InfoRequestPipelineFactory.java | 17 +- .../TerasologyClientPipelineFactory.java | 17 +- .../TerasologyServerPipelineFactory.java | 17 +- .../engine/network/package-info.java | 17 +- .../ClientComponentFieldCheck.java | 17 +- .../NetComponentSerializeCheck.java | 17 +- .../ServerComponentFieldCheck.java | 17 +- .../engine/particles/ParticleData.java | 17 +- .../engine/particles/ParticleDataMask.java | 17 +- .../engine/particles/ParticlePool.java | 17 +- .../particles/ParticleSystemManager.java | 17 +- .../particles/ParticleSystemManagerImpl.java | 17 +- .../ParticleDataSpriteComponent.java | 21 +-- .../components/ParticleEmitterComponent.java | 17 +- .../AccelerationAffectorComponent.java | 21 +-- .../affectors/VelocityAffectorComponent.java | 21 +-- .../ColorRangeGeneratorComponent.java | 21 +-- .../EnergyRangeGeneratorComponent.java | 21 +-- .../PositionRangeGeneratorComponent.java | 21 +-- .../ScaleRangeGeneratorComponent.java | 21 +-- .../TextureOffsetGeneratorComponent.java | 17 +- .../VelocityRangeGeneratorComponent.java | 17 +- .../events/ParticleSystemUpdateEvent.java | 17 +- .../functions/ParticleSystemFunction.java | 17 +- .../RegisterParticleSystemFunction.java | 19 +- .../AccelerationAffectorFunction.java | 21 +-- .../functions/affectors/AffectorFunction.java | 17 +- .../affectors/VelocityAffectorFunction.java | 21 +-- .../ColorRangeGeneratorFunction.java | 17 +- .../EnergyRangeGeneratorFunction.java | 17 +- .../generators/GeneratorFunction.java | 17 +- .../PositionRangeGeneratorFunction.java | 17 +- .../ScaleRangeGeneratorFunction.java | 17 +- .../TextureOffsetGeneratorFunction.java | 17 +- .../VelocityRangeGeneratorFunction.java | 17 +- .../rendering/ParticleRenderingData.java | 21 +-- .../particles/updating/ParticleUpdater.java | 17 +- .../updating/ParticleUpdaterImpl.java | 2 +- .../engine/persistence/ChunkStore.java | 17 +- .../engine/persistence/PlayerStore.java | 19 +- .../engine/persistence/TemplateEngine.java | 17 +- .../persistence/TemplateEngineImpl.java | 17 +- .../engine/persistence/WorldDumper.java | 17 +- .../internal/AbstractStorageManager.java | 17 +- .../internal/ChunkStoreInternal.java | 19 +- .../internal/CompressedChunkBuilder.java | 17 +- .../internal/DelayedEntityRef.java | 17 +- .../DelayedEntityRefCopyStrategy.java | 17 +- .../internal/DelayedEntityRefFactory.java | 17 +- .../persistence/internal/EntityDelta.java | 17 +- .../persistence/internal/EntityRestorer.java | 19 +- .../internal/EntitySetDeltaRecorder.java | 17 +- .../persistence/internal/EntityStorer.java | 17 +- .../internal/GamePreviewImageProvider.java | 17 +- .../internal/GlobalStoreBuilder.java | 19 +- .../internal/GlobalStoreLoader.java | 19 +- .../internal/PlayerStoreBuilder.java | 17 +- .../internal/PlayerStoreInternal.java | 19 +- .../internal/ReadOnlyStorageManager.java | 17 +- .../internal/SaveTransactionBuilder.java | 17 +- .../internal/SaveTransactionHelper.java | 17 +- .../internal/SaveTransactionResult.java | 17 +- .../internal/StoragePathProvider.java | 19 +- .../serializers/ComponentSerializeCheck.java | 17 +- .../serializers/EntityDataJSONFormat.java | 17 +- .../serializers/EventSerializer.java | 2 - .../serializers/NetworkEntitySerializer.java | 2 - .../serializers/WorldSerializer.java | 17 +- .../serializers/WorldSerializerImpl.java | 17 +- .../typeHandling/RegisterTypeHandler.java | 17 +- .../RegisterTypeHandlerFactory.java | 17 +- .../extensionTypes/AssetTypeHandler.java | 2 - .../extensionTypes/BlockTypeHandler.java | 2 - .../extensionTypes/ChunkMeshTypeHandler.java | 2 - .../CollisionGroupTypeHandler.java | 2 - .../extensionTypes/EntityRefTypeHandler.java | 2 - .../extensionTypes/NameTypeHandler.java | 2 - .../extensionTypes/PrefabTypeHandler.java | 2 - .../TextureRegionTypeHandler.java | 2 - .../UITextureRegionTypeHandler.java | 2 - .../ComponentClassTypeHandlerFactory.java | 2 +- .../gson/AbstractGsonPersistedData.java | 2 - .../gson/GsonMapExclusionStrategy.java | 17 +- .../typeHandling/gson/GsonPersistedData.java | 19 +- .../gson/GsonPersistedDataArray.java | 2 - .../gson/GsonPersistedDataMap.java | 2 - .../gson/GsonPersistedDataReader.java | 2 +- .../gson/GsonPersistedDataSerializer.java | 2 - .../gson/GsonPersistedDataWriter.java | 2 +- .../gson/PolymorphicTypeAdapterFactory.java | 17 +- .../mathTypes/BlockAreaTypeHandler.java | 4 +- .../mathTypes/BlockAreacTypeHandler.java | 4 +- .../mathTypes/QuaternionfTypeHandler.java | 2 - .../mathTypes/Vector2fTypeHandler.java | 2 - .../mathTypes/Vector2iTypeHandler.java | 2 - .../mathTypes/Vector3fTypeHandler.java | 2 - .../mathTypes/Vector3iTypeHandler.java | 2 - .../mathTypes/Vector4fTypeHandler.java | 2 - .../protobuf/ProtobufDataReader.java | 2 +- .../protobuf/ProtobufDataWriter.java | 2 +- .../protobuf/ProtobufPersistedData.java | 2 - .../ProtobufPersistedDataSerializer.java | 2 - .../engine/physics/CollisionGroup.java | 19 +- .../engine/physics/CollisionGroupManager.java | 19 +- .../terasology/engine/physics/HitResult.java | 17 +- .../terasology/engine/physics/Physics.java | 19 +- .../physics/StandardCollisionGroup.java | 19 +- .../engine/physics/bullet/BulletPhysics.java | 177 ++++++++++-------- .../physics/bullet/BulletSweepCallback.java | 23 +-- .../physics/bullet/EntityMotionState.java | 17 +- .../physics/bullet/shapes/BulletBoxShape.java | 17 +- .../bullet/shapes/BulletCollisionShape.java | 17 +- .../shapes/BulletCollisionShapeFactory.java | 17 +- .../bullet/shapes/BulletCompoundShape.java | 17 +- .../bullet/shapes/BulletConvexHullShape.java | 17 +- .../bullet/shapes/BulletCylinderShape.java | 17 +- .../bullet/shapes/BulletSphereShape.java | 17 +- .../components/RigidBodyComponent.java | 19 +- .../physics/components/TriggerComponent.java | 19 +- .../physics/components/package-info.java | 17 +- .../components/shapes/BoxShapeComponent.java | 19 +- .../shapes/CapsuleShapeComponent.java | 19 +- .../shapes/CylinderShapeComponent.java | 19 +- .../components/shapes/HullShapeComponent.java | 19 +- .../shapes/SphereShapeComponent.java | 19 +- .../components/shapes/package-info.java | 17 +- .../physics/engine/CharacterCollider.java | 17 +- .../engine/physics/engine/PhysicsEngine.java | 17 +- .../physics/engine/PhysicsEngineManager.java | 17 +- .../engine/physics/engine/PhysicsSystem.java | 17 +- .../engine/physics/engine/RigidBody.java | 17 +- .../engine/physics/engine/SweepCallback.java | 17 +- .../physics/events/BlockImpactEvent.java | 17 +- .../physics/events/ChangeVelocityEvent.java | 19 +- .../engine/physics/events/CollideEvent.java | 17 +- .../physics/events/EntityImpactEvent.java | 17 +- .../engine/physics/events/ForceEvent.java | 19 +- .../engine/physics/events/ImpactEvent.java | 17 +- .../engine/physics/events/ImpulseEvent.java | 19 +- .../engine/physics/events/MovedEvent.java | 17 +- .../physics/events/PhysicsResynchEvent.java | 19 +- .../engine/physics/events/package-info.java | 17 +- .../engine/physics/package-info.java | 17 +- .../engine/physics/shapes/BoxShape.java | 17 +- .../engine/physics/shapes/CollisionShape.java | 17 +- .../physics/shapes/CollisionShapeFactory.java | 17 +- .../engine/physics/shapes/CompoundShape.java | 17 +- .../physics/shapes/ConvexHullShape.java | 17 +- .../engine/physics/shapes/SphereShape.java | 17 +- .../engine/physics/shapes/package-info.java | 17 +- .../CharacterStateEventPositionMap.java | 17 +- .../DirectionAndOriginPosRecorder.java | 17 +- .../DirectionAndOriginPosRecorderList.java | 17 +- .../engine/recording/EventCatcher.java | 17 +- .../engine/recording/EventCopier.java | 17 +- .../recording/EventSystemReplayImpl.java | 5 +- .../RecordAndReplayCurrentStatus.java | 17 +- .../recording/RecordAndReplayStatus.java | 17 +- .../recording/RecordAndReplayUtils.java | 17 +- .../engine/recording/RecordedEntityRef.java | 17 +- .../engine/recording/RecordedEvent.java | 17 +- .../recording/RecordedEventSerializer.java | 2 +- .../engine/recording/RecordedEventStore.java | 17 +- .../RecordingEventSystemDecorator.java | 2 +- .../reflect/ByteCodeReflectFactory.java | 2 - .../engine/registry/CoreRegistry.java | 17 +- .../org/terasology/engine/registry/In.java | 17 +- .../engine/registry/InjectionHelper.java | 2 - .../org/terasology/engine/registry/Share.java | 17 +- .../engine/registry/package-info.java | 17 +- .../rendering/BlockOverlayRenderer.java | 2 - .../engine/rendering/RenderHelper.java | 2 - .../engine/rendering/RenderMath.java | 2 - .../assets/animation/MeshAnimation.java | 2 - .../assets/animation/MeshAnimationData.java | 2 - .../assets/animation/MeshAnimationFrame.java | 2 - .../assets/animation/MeshAnimationImpl.java | 2 - .../assets/atlas/AltasTileProducer.java | 2 - .../engine/rendering/assets/atlas/Atlas.java | 2 - .../rendering/assets/atlas/AtlasData.java | 2 - .../assets/atlas/AtlasDefinition.java | 2 - .../rendering/assets/atlas/AtlasFormat.java | 2 - .../assets/atlas/FreeformDefinition.java | 2 - .../assets/atlas/GridDefinition.java | 2 - .../engine/rendering/assets/font/Font.java | 2 - .../rendering/assets/font/FontCharacter.java | 2 - .../rendering/assets/font/FontData.java | 2 - .../assets/font/FontDataBuilder.java | 2 - .../rendering/assets/font/FontFormat.java | 2 - .../assets/font/FontMaterialProducer.java | 2 - .../rendering/assets/material/Material.java | 2 - .../assets/material/MaterialData.java | 2 - .../assets/material/MaterialFormat.java | 2 - .../rendering/assets/mesh/MeshData.java | 2 - .../assets/shader/GLSLShaderFormat.java | 3 - .../rendering/assets/shader/Shader.java | 2 - .../rendering/assets/shader/ShaderData.java | 2 - .../assets/shader/ShaderMetadata.java | 2 - .../shader/ShaderParameterMetadata.java | 2 - .../rendering/assets/skeletalmesh/Bone.java | 2 - .../assets/skeletalmesh/BoneWeight.java | 2 - .../assets/skeletalmesh/SkeletalMesh.java | 2 - .../assets/skeletalmesh/SkeletalMeshData.java | 4 +- .../skeletalmesh/SkeletalMeshDataBuilder.java | 5 +- .../assets/texture/AWTTextureFormat.java | 2 - .../assets/texture/BasicTextureRegion.java | 2 - .../assets/texture/PNGTextureFormat.java | 3 - .../rendering/assets/texture/TextureData.java | 2 - .../assets/texture/TextureInfoFormat.java | 2 - .../assets/texture/TextureRegionAsset.java | 2 - .../assets/texture/subtexture/Subtexture.java | 4 +- .../texture/subtexture/SubtextureData.java | 2 - .../engine/rendering/dag/AbstractNode.java | 27 ++- .../RunOrderConnection.java | 4 +- .../dag/stateChanges/SetFboWriteMask.java | 32 ++-- .../dag/stateChanges/SetInputTexture.java | 66 ++++--- .../rendering/gltf/GLTFCommonFormat.java | 21 ++- .../rendering/gltf/MeshAttributeSemantic.java | 26 ++- .../rendering/gltf/model/GLTFAccessor.java | 4 +- .../gltf/model/GLTFAnimationSampler.java | 4 +- .../gltf/model/GLTFChannelTarget.java | 4 +- .../rendering/gltf/model/GLTFSparse.java | 4 +- .../iconmesh/IconMeshDataProducer.java | 2 - .../engine/rendering/logic/AnimEndEvent.java | 2 - .../rendering/logic/ChunkMeshComponent.java | 2 +- .../rendering/logic/FloatingTextRenderer.java | 1 - .../rendering/logic/LightFadeComponent.java | 2 - .../rendering/logic/LightFadeSystem.java | 2 - .../engine/rendering/logic/MeshComponent.java | 2 - .../logic/SkeletalMeshComponent.java | 2 - .../rendering/logic/SkeletonRenderer.java | 2 - .../engine/rendering/nui/NUIManager.java | 2 - .../engine/rendering/nui/UIScreenLayer.java | 2 - .../editor/layers/AbstractEditorScreen.java | 2 +- .../nui/editor/utils/NUIEditorNodeUtils.java | 47 ++--- .../rendering/nui/internal/LineRenderer.java | 4 +- .../nui/internal/LwjglCanvasRenderer.java | 136 ++++++++------ .../nui/internal/NUIManagerInternal.java | 25 ++- .../nui/internal/TerasologyCanvasImpl.java | 2 - .../internal/TerasologyCanvasRenderer.java | 2 - .../nui/internal/TypeWidgetLibraryImpl.java | 4 +- .../nui/internal/WidgetMetadata.java | 2 - .../nui/layers/hud/CoreHudWidget.java | 2 - .../nui/layers/hud/HUDScreenLayer.java | 2 - .../rendering/nui/layers/hud/HudToolbar.java | 2 - .../rendering/nui/layers/hud/UICrosshair.java | 2 - .../nui/layers/ingame/DevToolsMenuScreen.java | 4 +- .../nui/layers/ingame/InspectionScreen.java | 2 - .../ingame/metrics/AllocationsMode.java | 2 - .../ingame/metrics/HeapAllocationMode.java | 3 +- .../ingame/metrics/NetworkStatsMode.java | 2 - .../ingame/metrics/NullMetricsMode.java | 2 - .../ingame/metrics/RunningMeansMode.java | 2 - .../ingame/metrics/RunningThreadsMode.java | 2 - .../nui/layers/ingame/metrics/SpikesMode.java | 2 - .../ingame/metrics/TimeMetricsMode.java | 2 - .../ingame/metrics/WorldRendererMode.java | 2 - .../nui/layers/mainMenu/AddServerPopup.java | 2 - .../nui/layers/mainMenu/EnterTextPopup.java | 2 - .../nui/layers/mainMenu/JoinGameScreen.java | 7 +- .../nui/layers/mainMenu/MessagePopup.java | 2 - .../nui/layers/mainMenu/NewGameScreen.java | 1 - .../nui/layers/mainMenu/ReplayScreen.java | 21 ++- .../nui/layers/mainMenu/SelectGameScreen.java | 27 ++- .../layers/mainMenu/ServerListDownloader.java | 5 +- .../layers/mainMenu/UniverseSetupScreen.java | 4 - .../gameDetailsScreen/GameDetailsScreen.java | 12 +- .../inputSettings/InputConfigBinding.java | 2 - .../inputSettings/InputSettingsScreen.java | 4 +- .../mainMenu/inputSettings/UIInputBind.java | 2 - .../mainMenu/loadingScreen/LoadingScreen.java | 2 - .../settings/AudioSettingsScreen.java | 2 - .../mainMenu/settings/SettingsMenuScreen.java | 2 - .../mainMenu/videoSettings/CameraSetting.java | 2 - .../videoSettings/CameraSettingBinding.java | 2 - .../videoSettings/DynamicShadows.java | 2 - .../videoSettings/DynamicShadowsBinding.java | 2 - .../layers/mainMenu/videoSettings/Preset.java | 2 - .../mainMenu/videoSettings/PresetBinding.java | 2 - .../videoSettings/WaterReflection.java | 2 - .../videoSettings/WaterReflectionBinding.java | 2 - .../rendering/nui/skin/UISkinFormat.java | 2 - .../nui/widgets/UIButtonWebBrowser.java | 2 +- .../BuiltinTypeWidgetTestScreen.java | 16 +- .../engine/rendering/opengl/FBO.java | 2 +- .../rendering/opengl/FrameBufferObject.java | 4 +- .../engine/rendering/opengl/GLSLMaterial.java | 3 +- .../engine/rendering/opengl/OpenGLMesh.java | 2 - .../rendering/opengl/OpenGLSkeletalMesh.java | 2 - .../rendering/opengl/OpenGLTexture.java | 3 - .../rendering/opengl/ScreenGrabber.java | 3 +- .../primitives/ChunkTessellator.java | 3 +- .../rendering/primitives/ChunkVertexFlag.java | 2 - .../engine/rendering/primitives/Sphere.java | 30 ++- .../rendering/world/RenderableWorld.java | 4 +- .../rendering/world/RenderableWorldImpl.java | 27 ++- .../rendering/world/WorldRendererImpl.java | 110 ++++++----- .../rendering/world/WorldRendererSystem.java | 2 - .../selection/BlockSelectionRenderer.java | 15 +- .../telemetry/GamePlayStatsComponent.java | 17 +- .../terasology/engine/telemetry/Metrics.java | 23 +-- .../engine/telemetry/TelemetryCategory.java | 17 +- .../engine/telemetry/TelemetryEmitter.java | 17 +- .../engine/telemetry/TelemetryField.java | 17 +- .../engine/telemetry/TelemetryParams.java | 17 +- .../engine/telemetry/TelemetryScreen.java | 92 ++++----- .../engine/telemetry/TelemetrySystem.java | 17 +- .../engine/telemetry/TelemetryUtils.java | 17 +- .../logstash/ModulesJsonProvider.java | 17 +- .../logstash/SystemContextJsonProvider.java | 17 +- .../logstash/TelemetryLogstashAppender.java | 17 +- .../logstash/UserIdJsonProvider.java | 17 +- .../metrics/BlockDestroyedMetric.java | 17 +- .../telemetry/metrics/BlockPlacedMetric.java | 17 +- .../metrics/CreatureKilledMetric.java | 17 +- .../telemetry/metrics/GamePlayMetric.java | 17 +- .../engine/telemetry/metrics/Metric.java | 17 +- .../telemetry/metrics/ModulesMetric.java | 17 +- .../metrics/SystemContextMetric.java | 17 +- .../terasology/engine/unicode/Dingbats.java | 17 +- .../engine/unicode/EnclosedAlphanumerics.java | 17 +- .../engine/utilities/FilesUtil.java | 2 - .../engine/utilities/NativeHelper.java | 2 - .../engine/utilities/ReflectionUtil.java | 4 +- .../collection/CharSequenceIterator.java | 2 - .../utilities/concurrency/AbstractTask.java | 2 - .../utilities/concurrency/ShutdownTask.java | 2 - .../utilities/concurrency/TaskProcessor.java | 2 - .../utilities/gson/AssetTypeAdapter.java | 2 - .../engine/utilities/gson/InputHandler.java | 2 - .../gson/QuaternionfTypeAdapter.java | 2 - .../gson/SetMultimapTypeAdapter.java | 2 - .../utilities/gson/Vector2fTypeAdapter.java | 2 - .../utilities/gson/Vector2iTypeAdapter.java | 2 - .../utilities/gson/Vector3fTypeAdapter.java | 2 - .../utilities/gson/Vector4fTypeAdapter.java | 2 - .../engine/utilities/procedural/Voronoi.java | 2 - .../reflection/SpecificAccessibleObject.java | 2 - .../world/RelevanceRegionComponent.java | 2 - .../engine/world/WorldChangeListener.java | 2 - .../world/block/BlockBuilderHelper.java | 16 +- .../engine/world/block/BlockExplorer.java | 2 - .../world/block/BlockLifecycleEvent.java | 2 - .../engine/world/block/BlockManager.java | 2 - .../engine/world/block/BlockPart.java | 2 - .../world/block/BlockUriParseException.java | 2 - .../engine/world/block/ForceBlockActive.java | 2 - .../block/RequiresBlockLifecycleEvents.java | 2 - .../damage/BlockDamageModifierComponent.java | 2 - .../LargeBlockUpdateFinished.java | 2 - .../LargeBlockUpdateStarting.java | 2 - .../entity/placement/BlockPlacingSystem.java | 2 - .../block/entity/placement/PlaceBlocks.java | 2 - .../block/family/BlockFamilyLibrary.java | 14 +- .../block/internal/BlockPrefabManager.java | 2 - .../engine/world/block/loader/EntityData.java | 2 - .../world/block/loader/InventoryData.java | 2 - .../block/loader/SectionDefinitionData.java | 2 - .../block/regions/BlockRegionComponent.java | 4 +- .../block/regions/BlockRegionSystem.java | 2 - .../world/block/shapes/BlockShapeData.java | 2 - .../world/block/shapes/BlockShapeImpl.java | 2 - .../block/shapes/JsonBlockShapeLoader.java | 2 - .../BlockStructuralSupportSystem.java | 2 - .../structure/SideBlockSupportRequired.java | 22 ++- .../engine/world/block/tiles/BlockTile.java | 2 - .../engine/world/block/tiles/TileData.java | 2 - .../engine/world/block/tiles/TileFormat.java | 5 +- .../engine/world/block/tiles/WorldAtlas.java | 2 - .../world/block/tiles/WorldAtlasImpl.java | 2 - .../typeEntity/BlockTypeClientSystem.java | 2 - .../block/typeEntity/BlockTypeComponent.java | 2 - .../typeEntity/BlockTypeEntityGenerator.java | 2 - .../world/chunks/ChunkBlockIterator.java | 2 - .../world/chunks/ChunkRegionListener.java | 2 - .../engine/world/chunks/LodChunk.java | 2 - .../engine/world/chunks/LodChunkProvider.java | 56 +++--- .../world/chunks/event/BeforeChunkUnload.java | 2 - .../world/chunks/event/OnChunkGenerated.java | 2 - .../world/chunks/event/OnChunkLoaded.java | 2 - .../internal/ChunkBlockIteratorImpl.java | 2 - .../chunks/internal/ChunkRelevanceRegion.java | 6 +- .../chunks/internal/ChunkSerializer.java | 2 - .../ChunkUnloadRequest.java | 2 - .../engine/world/generation/FacetBorder.java | 2 - .../world/generation/FacetProvider.java | 2 - .../world/generation/GeneratingRegion.java | 2 - .../engine/world/generation/Produces.java | 2 - .../engine/world/generation/Region.java | 2 - .../engine/world/generation/RegionImpl.java | 6 +- .../engine/world/generation/Updates.java | 2 - .../engine/world/generation/World.java | 2 - .../engine/world/generation/WorldBuilder.java | 27 +-- .../engine/world/generation/WorldFacet.java | 2 - .../engine/world/generation/WorldFacet2D.java | 2 - .../engine/world/generation/WorldFacet3D.java | 2 - .../engine/world/generation/WorldImpl.java | 2 - .../world/generation/WorldRasterizer.java | 2 - .../world/generation/facets/DensityFacet.java | 2 - .../facets/SurfaceTemperatureFacet.java | 2 - .../facets/base/BaseBooleanFieldFacet3D.java | 2 - .../generation/facets/base/BaseFacet2D.java | 2 - .../generation/facets/base/BaseFacet3D.java | 2 - .../facets/base/BaseFieldFacet2D.java | 2 - .../facets/base/BaseFieldFacet3D.java | 2 - .../facets/base/BaseObjectFacet2D.java | 2 - .../facets/base/BooleanFieldFacet3D.java | 2 - .../generation/facets/base/FieldFacet2D.java | 2 - .../generation/facets/base/FieldFacet3D.java | 2 - .../generation/facets/base/ObjectFacet2D.java | 2 - .../generation/facets/base/ObjectFacet3D.java | 2 - .../world/generator/ChunkGenerationPass.java | 2 - .../UnresolvedWorldGeneratorException.java | 2 - .../internal/WorldGeneratorInfo.java | 2 - .../internal/WorldGeneratorManager.java | 2 - .../DefaultWorldGeneratorPluginLibrary.java | 5 +- .../generator/plugin/RegisterPlugin.java | 2 - .../plugin/WorldGeneratorPlugin.java | 2 - .../AbstractWorldProviderDecorator.java | 2 - .../world/internal/ChunkViewCoreImpl.java | 2 - .../world/internal/WorldProviderCoreImpl.java | 4 +- .../world/internal/WorldProviderWrapper.java | 2 - .../engine/world/time/WorldTime.java | 2 - .../engine/world/time/WorldTimeImpl.java | 2 - .../engine/world/zones/LayerThickness.java | 2 +- .../terasology/engine/world/zones/Zone.java | 2 +- .../world/zones/ZoneRegionFunction.java | 2 +- .../org/terasology/protobuf/EntityData.java | 3 + .../java/org/terasology/protobuf/NetData.java | 3 + .../org/terasology/protobuf/package-info.java | 17 +- .../terasology/engine/GLFWSplashScreen.java | 2 +- .../editor/input/AwtKeyboardDevice.java | 2 +- .../editor/input/AwtMouseDevice.java | 2 +- .../editor/properties/FloatProperty.java | 17 +- .../editor/properties/Property.java | 17 +- .../editor/properties/PropertyProvider.java | 17 +- .../editor/properties/ReflectionProvider.java | 18 +- .../editor/properties/SceneProperties.java | 17 +- .../terasology/editor/subsystem/AwtInput.java | 2 +- .../editor/subsystem/LwjglPortlet.java | 2 +- .../subsystem/LwjglPortletDisplayDevice.java | 2 +- .../org/terasology/editor/ui/MainWindow.java | 17 +- .../terasology/editor/ui/PropertyPanel.java | 17 +- .../terasology/editor/ui/PropertySlider.java | 17 +- .../org/terasology/editor/ui/Viewport.java | 17 +- subsystems/DiscordRPC/build.gradle.kts | 2 +- .../discordrpc/DiscordRPCBuffer.java | 2 +- .../discordrpc/DiscordRPCSystem.java | 2 +- .../discordrpc/DiscordRPCThread.java | 11 +- .../serializers/DeserializeFieldCheck.java | 2 +- .../serializers/PersistedDataReader.java | 2 +- .../serializers/PersistedDataWriter.java | 2 +- .../persistence/serializers/Serializer.java | 2 +- .../DeserializationException.java | 2 +- .../typeHandling/FutureTypeHandler.java | 2 +- .../typeHandling/InstanceCreator.java | 2 +- .../typeHandling/PersistedData.java | 4 +- .../typeHandling/PersistedDataArray.java | 4 +- .../typeHandling/PersistedDataMap.java | 2 - .../typeHandling/PersistedDataSerializer.java | 6 +- .../typeHandling/SerializationException.java | 2 +- .../SpecificTypeHandlerFactory.java | 2 +- .../StringRepresentationTypeHandler.java | 4 +- .../persistence/typeHandling/TypeHandler.java | 2 +- .../typeHandling/TypeHandlerFactory.java | 2 +- .../annotations/SerializedName.java | 2 +- .../coreTypes/BooleanTypeHandler.java | 2 - .../coreTypes/ByteTypeHandler.java | 2 - .../coreTypes/DoubleTypeHandler.java | 2 - .../coreTypes/EnumTypeHandler.java | 2 - .../coreTypes/FloatTypeHandler.java | 2 - .../coreTypes/IntTypeHandler.java | 2 - .../coreTypes/LongTypeHandler.java | 2 - .../coreTypes/NumberTypeHandler.java | 2 - .../coreTypes/StringMapTypeHandler.java | 2 - .../coreTypes/StringTypeHandler.java | 2 - .../inMemory/AbstractPersistedData.java | 2 - .../inMemory/PersistedBoolean.java | 4 +- .../typeHandling/inMemory/PersistedBytes.java | 2 +- .../inMemory/PersistedDouble.java | 4 +- .../typeHandling/inMemory/PersistedFloat.java | 4 +- .../inMemory/PersistedInteger.java | 4 +- .../typeHandling/inMemory/PersistedLong.java | 4 +- .../typeHandling/inMemory/PersistedMap.java | 2 - .../inMemory/PersistedNumber.java | 4 +- .../inMemory/PersistedString.java | 4 +- .../inMemory/arrays/PersistedNumberArray.java | 2 +- .../inMemory/arrays/PersistedValueArray.java | 2 +- .../typeHandling/package-info.java | 2 +- .../reflect/CollectionCopyConstructor.java | 17 +- .../typeHandling/FutureTypeHandlerTest.java | 6 +- .../typeHandling/TypeHandlerLibraryTest.java | 10 +- .../RuntimeDelegatingTypeHandlerTest.java | 6 +- .../ArrayTypeHandlerFactoryTest.java | 6 +- .../CollectionTypeHandlerFactoryTest.java | 8 +- .../factories/MapTypeHandlerFactoryTest.java | 8 +- .../ObjectFieldMapTypeHandlerFactoryTest.java | 4 +- subsystems/subprojects.settings.gradle | 2 +- 1089 files changed, 2420 insertions(+), 10499 deletions(-) diff --git a/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java b/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java index 6838a203c..bcbff1e32 100644 --- a/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java +++ b/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine; import com.google.common.collect.Maps; diff --git a/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java b/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java index 2f0f99815..46f6353bb 100644 --- a/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java +++ b/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java @@ -43,7 +43,6 @@ import static org.mockito.Mockito.mock; /** * A base class for unit test classes to inherit to run in a Terasology environment - with LWJGL set up and so forth - * */ public abstract class TerasologyTestingEnvironment { private static final Logger logger = LoggerFactory.getLogger(TerasologyTestingEnvironment.class); @@ -60,7 +59,7 @@ public abstract class TerasologyTestingEnvironment { @BeforeAll public static void setupEnvironment(@TempDir Path tempHome) throws Exception { PathManager.getInstance().useOverrideHomePath(tempHome); - Bullet.init(true,false); + Bullet.init(true, false); /* * Create at least for each class a new headless environment as it is fast and prevents side effects @@ -95,12 +94,15 @@ public abstract class TerasologyTestingEnvironment { context.put(CharacterStateEventPositionMap.class, characterStateEventPositionMap); DirectionAndOriginPosRecorderList directionAndOriginPosRecorderList = new DirectionAndOriginPosRecorderList(); context.put(DirectionAndOriginPosRecorderList.class, directionAndOriginPosRecorderList); - RecordAndReplaySerializer recordAndReplaySerializer = new RecordAndReplaySerializer(engineEntityManager, recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); + RecordAndReplaySerializer recordAndReplaySerializer = new RecordAndReplaySerializer(engineEntityManager, + recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, + directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); context.put(RecordAndReplaySerializer.class, recordAndReplaySerializer); Path savePath = PathManager.getInstance().getSavePath("world1"); context.put(StorageManager.class, new ReadWriteStorageManager(savePath, moduleManager.getEnvironment(), - engineEntityManager, mockBlockManager, extraDataManager, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus)); + engineEntityManager, mockBlockManager, extraDataManager, recordAndReplaySerializer, + recordAndReplayUtils, recordAndReplayCurrentStatus)); ComponentSystemManager componentSystemManager = new ComponentSystemManager(context); context.put(ComponentSystemManager.class, componentSystemManager); diff --git a/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java b/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java index 61452547d..7ce3505fc 100644 --- a/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java +++ b/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine; import org.terasology.gestalt.naming.Name; diff --git a/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java b/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java index ac421d259..b2b3a2e11 100644 --- a/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java +++ b/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java @@ -17,7 +17,7 @@ public class TestAutoConfig extends AutoConfig { ); public final Setting> integerListSetting = setting( - type(new TypeInfo>() {}), + type(new TypeInfo>() { }), defaultValue(ImmutableList.of()) ); diff --git a/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java b/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java index d761fb18f..77eadc8a3 100644 --- a/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java +++ b/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.testUtil; @@ -34,8 +21,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -/** - */ public class WorldProviderCoreStub implements WorldProviderCore { private Map blocks = Maps.newHashMap(); diff --git a/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java b/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java index 206a7657a..d20ef6976 100644 --- a/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java +++ b/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.propagation; import com.google.common.collect.Maps; @@ -26,8 +13,6 @@ import org.terasology.engine.world.block.BlockRegionc; import java.util.Map; -/** - */ public class StubPropagatorWorldView implements PropagatorWorldView { private TObjectByteMap lightData = new TObjectByteHashMap<>(); private Map blockData = Maps.newHashMap(); diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java index d15325be9..ace5c103a 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java @@ -5,8 +5,6 @@ package org.terasology.unittest.stubs; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; -/** - */ public class EntityRefComponent implements Component { public EntityRef entityRef = EntityRef.NULL; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java index 97568be51..d34cc4693 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java @@ -5,8 +5,6 @@ package org.terasology.unittest.stubs; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.world.block.ForceBlockActive; -/** - */ @ForceBlockActive public class ForceBlockActiveComponent implements Component { } diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java index ac80ec088..87d18b871 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java @@ -5,8 +5,6 @@ package org.terasology.unittest.stubs; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; -/** - */ public class GetterSetterComponent implements Component { public transient boolean getterUsed; public transient boolean setterUsed; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java index 83e7e35ee..a2341a8b8 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java @@ -4,8 +4,6 @@ package org.terasology.unittest.stubs; import org.terasology.engine.entitySystem.Component; -/** - */ public final class IntegerComponent implements Component { public int value; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java index b149b2cb0..471cb68da 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java @@ -6,8 +6,6 @@ package org.terasology.unittest.stubs; import org.terasology.engine.entitySystem.Component; import org.terasology.reflection.MappedContainer; -/** - */ public class MappedTypeComponent implements Component { public InnerType val = new InnerType(); diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java index d5e670de3..ebbf65ca5 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.Owns; import org.terasology.engine.entitySystem.entity.EntityRef; -/** - */ public class OwnerComponent implements Component { @Owns public EntityRef child = EntityRef.NULL; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java index b11a9498a..9fc1ea6d8 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java @@ -5,8 +5,6 @@ package org.terasology.unittest.stubs; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.world.block.ForceBlockActive; -/** - */ @ForceBlockActive(retainUnalteredOnBlockChange = true) public class RetainedOnBlockChangeComponent implements Component { public int value; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java index 330c97fbd..ff519f370 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java @@ -6,8 +6,6 @@ package org.terasology.unittest.stubs; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.systems.internal.DoNotAutoRegister; -/** - */ @DoNotAutoRegister public class UnsupportedTypeComponent implements Component { public UnsupportedType value; diff --git a/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java b/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java index 5f4e81e7c..1499001fe 100644 --- a/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java +++ b/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; import com.google.common.collect.ImmutableList; @@ -50,7 +37,7 @@ public class AutoConfigTest { ); assertEquals( - Sets.newHashSet(new TypeInfo>() {}, new TypeInfo>>() {}), + Sets.newHashSet(new TypeInfo>() { }, new TypeInfo>>() { }), settingFields.stream().map(Field::getGenericType).map(TypeInfo::of).collect(Collectors.toSet()) ); } diff --git a/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java b/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java index 863e87a2a..d1f6c936b 100644 --- a/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java +++ b/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible.constraints; import org.junit.jupiter.api.Nested; diff --git a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java index 880a5a835..ebf747c7d 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java +++ b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation; import com.google.common.collect.Multimaps; diff --git a/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java b/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java index 62c92e755..fe67aaac9 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java +++ b/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation; import com.google.common.collect.ArrayListMultimap; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java index dada13f02..d1f531c98 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java index ed9561704..16f6cfe54 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper; import java.io.BufferedWriter; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java index 96812acd5..5327bd3c8 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper; import com.google.common.collect.Multimap; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java index 26bcbdc88..d9da4eb4d 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper.util; diff --git a/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java b/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java index c89975995..551032a50 100644 --- a/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine; import ch.qos.logback.classic.Level; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java index cf14a997f..0419bef7b 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java @@ -52,8 +52,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK; -/** - */ public class PojoEntityManagerTest { private static Context context; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java index d8a9c0e45..e26a40681 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java @@ -31,8 +31,6 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class PojoEventSystemTests { ComponentLibrary compLibrary; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java index cabe26bd8..446685f2a 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java @@ -23,8 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -/** - */ public class PojoPrefabManagerTest { public static final String PREFAB_NAME = "unittest:myprefab"; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java index 81b3b585b..00fc3d99c 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java @@ -44,8 +44,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class PrefabTest { private static final Logger logger = LoggerFactory.getLogger(PrefabTest.class); diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java index 690850934..c254865f9 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java @@ -19,8 +19,6 @@ import org.terasology.reflection.reflect.ReflectionReflectFactory; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ComponentMetadataTest { private Context context; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java index addcfaddd..640abac3c 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java @@ -4,15 +4,13 @@ package org.terasology.engine.entitySystem.metadata; import org.junit.jupiter.api.Test; import org.terasology.gestalt.assets.ResourceUrn; -import org.terasology.unittest.stubs.OwnerComponent; import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.reflect.ReflectFactory; import org.terasology.reflection.reflect.ReflectionReflectFactory; +import org.terasology.unittest.stubs.OwnerComponent; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class FieldMetadataTest { private ReflectFactory factory = new ReflectionReflectFactory(); @@ -28,7 +26,8 @@ public class FieldMetadataTest { @Test public void testOwnsAnnotationCollectionProcessed() throws NoSuchMethodException { ComponentMetadata classMetadata = - new ComponentMetadata<>(new ResourceUrn("unittest:OwnedCollectionComponent"), org.terasology.engine.entitySystem.metadata.OwnedCollectionComponent.class, factory, copyStrategyLibrary); + new ComponentMetadata<>(new ResourceUrn("unittest:OwnedCollectionComponent"), + org.terasology.engine.entitySystem.metadata.OwnedCollectionComponent.class, factory, copyStrategyLibrary); ComponentFieldMetadata metadata = classMetadata.getField("items"); assertTrue(metadata.isOwnedReference()); } diff --git a/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java b/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java index 13f41190c..525d89d66 100644 --- a/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java @@ -28,8 +28,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - */ @Tag("TteTest") public class NetworkOwnershipTest extends TerasologyTestingEnvironment { diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java index 8ba875933..2c74a707e 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java @@ -38,8 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class ComponentSerializerTest { private static ModuleManager moduleManager; private ComponentSerializer componentSerializer; diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java index 0499c73b9..69cadca00 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java @@ -46,8 +46,6 @@ import static org.mockito.Mockito.when; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL; -/** - */ public class EntitySerializerTest { private static Context context; diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java index 4ae7ee139..3a4d5e819 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java @@ -44,11 +44,11 @@ class TypeSerializerTest extends ModuleEnvironmentTest { static { INSTANCE.list.addAll(Lists.newArrayList(50, 51, -52, -53)); - INSTANCE.animals.add(new Dog<>(1, new Vector3f(3.15f, 54.51f, -0.001f), new org.joml.Vector3f(10.0f,30.0f,-0.001f))); + INSTANCE.animals.add(new Dog<>(1, new Vector3f(3.15f, 54.51f, -0.001f), new org.joml.Vector3f(10.0f, 30.0f, -0.001f))); INSTANCE.animals.add(new Cheetah<>(2, Color.MAGENTA)); - INSTANCE.singleAnimal = new Dog<>(2, new Vector3f(4, 5, 6), new org.joml.Vector3f(4,5.8f,8)); + INSTANCE.singleAnimal = new Dog<>(2, new Vector3f(4, 5, 6), new org.joml.Vector3f(4, 5.8f, 8)); } private TypeHandlerLibrary typeHandlerLibrary; @@ -81,7 +81,7 @@ class TypeSerializerTest extends ModuleEnvironmentTest { @Test void testDeserialize() { Optional> deserialize = gsonSerializer.deserialize( - new TypeInfo>() {}, + new TypeInfo>() { }, INSTANCE_JSON.getBytes(TerasologyConstants.CHARSET)); assertTrue(deserialize.isPresent()); @@ -98,7 +98,7 @@ class TypeSerializerTest extends ModuleEnvironmentTest { //noinspection unchecked,OptionalGetWithoutIsPresent,OptionalGetWithoutIsPresent SomeClass deserializedInstance = - (SomeClass) gsonSerializer.deserialize(new TypeInfo>() {}, bytes) + (SomeClass) gsonSerializer.deserialize(new TypeInfo>() { }, bytes) .get(); assertNotEmpty(typeHandlerLibrary.getTypeHandler(Animal.class)); @@ -130,9 +130,9 @@ class TypeSerializerTest extends ModuleEnvironmentTest { return false; } SomeClass someClass = (SomeClass) o; - return Objects.equals(data, someClass.data) && - Objects.equals(list, someClass.list) && - Objects.equals(animals, someClass.animals); + return Objects.equals(data, someClass.data) + && Objects.equals(list, someClass.list) + && Objects.equals(animals, someClass.animals); } @Override diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java index 6df99c4ce..b982fb4ce 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java @@ -21,8 +21,6 @@ import org.terasology.persistence.serializers.Serializer; import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.reflection.TypeInfo; -import java.io.IOException; - import static org.terasology.joml.test.VectorAssert.assertEquals; @SuppressWarnings("FieldCanBeLocal") diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java index 450b6fea2..97758cf18 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java index 55644eb85..18d5bdd05 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java @@ -25,8 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class OwnershipHelperTest { private static ModuleManager moduleManager; @@ -41,7 +39,7 @@ public class OwnershipHelperTest { @BeforeEach public void setup() { ContextImpl context = new ContextImpl(); - context.put( ModuleManager.class, moduleManager); + context.put(ModuleManager.class, moduleManager); NetworkSystem networkSystem = mock(NetworkSystem.class); when(networkSystem.getMode()).thenReturn(NetworkMode.NONE); context.put(NetworkSystem.class, networkSystem); diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java index 94d7ea3f2..36070ff0f 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; @@ -29,8 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class PojoEntityPoolTest { private PojoEntityPool pool; diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java index bd620c569..b225fa948 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java index 84e7e6499..5982ad494 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata.internal; import org.junit.jupiter.api.BeforeEach; @@ -28,8 +15,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class MetadataBuilderTest { private ReflectFactory factory = new ReflectionReflectFactory(); diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java b/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java index f8e947e81..fdbb91d24 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java b/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java index 0b4dbaa1a..814f0141c 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java b/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java index cc9069a9f..c3841a862 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java b/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java index a69fad1c2..5c2cee3dc 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java b/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java index d04ac2a42..49eb8c853 100644 --- a/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java +++ b/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java @@ -92,7 +92,7 @@ public class TranslationFormatTests { } @Test - public void testMultiLine() throws IOException, InvalidAssetFilenameException{ + public void testMultiLine() throws IOException, InvalidAssetFilenameException { byte[] resource = createSimpleMultiLineTranslationFile().getBytes(StandardCharsets.UTF_8); AssetDataFile assetDataFile = mockAssetDataFile("game.lang", resource); ResourceUrn urn = createUrnFromFile(format, assetDataFile); @@ -115,7 +115,7 @@ public class TranslationFormatTests { return new ResourceUrn("engine:" + assetName.toString()); } - private static String createSimpleMultiLineTranslationFile(){ + private static String createSimpleMultiLineTranslationFile() { StringBuilder sb = new StringBuilder(); sb.append("{"); sb.append("\"multi-line\": [\"line 1 \n \",\"line 2 \n \",\"line 3\"],"); diff --git a/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java b/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java index 5d8e7136f..0d995022c 100644 --- a/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java +++ b/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java @@ -1,27 +1,12 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ + public class CertificateTests { @Test diff --git a/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java b/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java index bbc8671a8..d4fd60116 100644 --- a/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java +++ b/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.junit.jupiter.api.Test; @@ -23,9 +10,7 @@ import java.nio.charset.Charset; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - * - */ + public class MasterSecretGeneratorTests { @Test diff --git a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java index ab34a9232..da21dfb59 100644 --- a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.gson.JsonElement; diff --git a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java index 1694c8673..84a140fdf 100644 --- a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java +++ b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java index 0d418a43f..c7893ba56 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java index 3c32cd6c4..fcefb2a9d 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.BeforeEach; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java index 85cd64ec5..95b900847 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java b/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java index 7973f1c3d..874669454 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.slf4j.Logger; @@ -55,10 +42,10 @@ public final class Example { treeBuilder.registerDecorator("repeat", Repeat.class); actor = new Actor(null); actor.setDelta(0.1f); - node = treeBuilder.fromJson("{ sequence:[ " + - "{repeat :{ count:5, child:{print:{msg:x}}}}, success, { delay:{duration:1}}, { print:{msg:Hello} }, { delay:{duration:1}}, { print:{msg:World} } " - + - "] }"); + node = treeBuilder.fromJson( + "{ sequence:[ " + + "{repeat :{ count:5, child:{print:{msg:x}}}}, success, { delay:{duration:1}}, { print:{msg:Hello} }, { delay:{duration:1}}, { print:{msg:World} } " + + "] }"); tree = new DefaultBehaviorTreeRunner(node, actor); for (int i = 0; i < 100; i++) { tree.step(); diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java index 40c043b6f..bb77646fc 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Disabled; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java index d3c008233..0f3ffed01 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java index 487bea39e..c057593ab 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java b/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java index 05c25700e..c08192150 100644 --- a/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java @@ -6,8 +6,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertSame; -/** - */ public class KinematicCharacterMoverTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java b/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java index 8fe5d5378..53e9e4fc3 100644 --- a/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console; diff --git a/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java b/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java index 005a28b20..617e91759 100644 --- a/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java @@ -19,8 +19,6 @@ import static org.terasology.joml.test.QuaternionAssert.assertEquals; import static org.terasology.joml.test.VectorAssert.assertEquals; -/** - */ @Tag("TteTest") public class LocationComponentTest extends TerasologyTestingEnvironment { diff --git a/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java b/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java index 66e406601..ad8ac784d 100644 --- a/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java +++ b/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; @@ -29,20 +16,18 @@ import java.util.Set; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ + public class Diamond3iIteratorTest { @Test public void testZeroDistanceIteration() { - Iterator iter = Diamond3iIterable.region(new org.joml.Vector3i(),0).build().iterator(); + Iterator iter = Diamond3iIterable.region(new org.joml.Vector3i(), 0).build().iterator(); assertEquals(Lists.newArrayList(new Vector3i()), Lists.newArrayList(iter)); } @Test public void testOneDistanceIteration() { - Iterator iter = Diamond3iIterable.region(new Vector3i(),1).build().iterator(); + Iterator iter = Diamond3iIterable.region(new Vector3i(), 1).build().iterator(); Set expected = Sets.newHashSet(new Vector3i(), new Vector3i(1, 0, 0), new Vector3i(-1, 0, 0), new Vector3i(0, 1, 0), new Vector3i(0, -1, 0), new Vector3i(0, 0, 1), new Vector3i(0, 0, -1)); while (iter.hasNext()) { @@ -55,7 +40,7 @@ public class Diamond3iIteratorTest { @Test public void testTwoDistanceIteration() { int cc = 0; - for (Vector3ic next : Diamond3iIterable.region(new Vector3i(), 2).build()){ + for (Vector3ic next : Diamond3iIterable.region(new Vector3i(), 2).build()) { assertTrue(next.gridDistance(new Vector3i()) <= 2); cc++; } diff --git a/engine-tests/src/test/java/org/terasology/math/DirectionTests.java b/engine-tests/src/test/java/org/terasology/math/DirectionTests.java index 4994e3458..eabc65338 100644 --- a/engine-tests/src/test/java/org/terasology/math/DirectionTests.java +++ b/engine-tests/src/test/java/org/terasology/math/DirectionTests.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.Nested; diff --git a/engine-tests/src/test/java/org/terasology/math/IntMathTest.java b/engine-tests/src/test/java/org/terasology/math/IntMathTest.java index 67afef7d7..cc768355c 100644 --- a/engine-tests/src/test/java/org/terasology/math/IntMathTest.java +++ b/engine-tests/src/test/java/org/terasology/math/IntMathTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.AfterAll; @@ -30,9 +17,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - * - */ + public class IntMathTest { public IntMathTest() { } diff --git a/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java b/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java index e0358f1a4..3c6af73b4 100644 --- a/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java +++ b/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/math/RotationTest.java b/engine-tests/src/test/java/org/terasology/math/RotationTest.java index e0bedcd5e..d97487387 100644 --- a/engine-tests/src/test/java/org/terasology/math/RotationTest.java +++ b/engine-tests/src/test/java/org/terasology/math/RotationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import com.google.common.collect.Iterables; @@ -30,8 +17,6 @@ import org.terasology.engine.math.Yaw; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.terasology.joml.test.QuaternionAssert.assertEquals; -/** - */ public class RotationTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/math/SideTest.java b/engine-tests/src/test/java/org/terasology/math/SideTest.java index 37324c1e8..b719828d7 100644 --- a/engine-tests/src/test/java/org/terasology/math/SideTest.java +++ b/engine-tests/src/test/java/org/terasology/math/SideTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.Test; @@ -21,8 +8,6 @@ import org.terasology.engine.math.Side; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class SideTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/network/TestNetwork.java b/engine-tests/src/test/java/org/terasology/network/TestNetwork.java index 6ca43d62f..50812892a 100644 --- a/engine-tests/src/test/java/org/terasology/network/TestNetwork.java +++ b/engine-tests/src/test/java/org/terasology/network/TestNetwork.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; @@ -37,8 +24,6 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.mock; -/** - */ @Tag("TteTest") public class TestNetwork extends TerasologyTestingEnvironment { diff --git a/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java b/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java index f181cd30d..1967364b2 100644 --- a/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java +++ b/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java b/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java index 54a68dd26..5a3aaeada 100644 --- a/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java +++ b/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.updating; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java b/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java index e18449ad4..1f7561f96 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import com.google.common.collect.Lists; @@ -34,8 +21,6 @@ import java.io.OutputStreamWriter; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class EntityDataJSONFormatTest { public static final String VALUE_NAME = "Name"; diff --git a/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java b/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java index e5fe5308d..34b6b4bb2 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; diff --git a/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java b/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java index d2ba7f3e3..fbc254d49 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.junit.jupiter.api.Tag; diff --git a/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java b/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java index 7476908f9..dd1ce18fe 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.codehaus.plexus.util.FileUtils; diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java index 3aa889d4b..a330084fc 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.Gson; @@ -66,7 +53,7 @@ public class GsonTypeHandlerAdapterTest { assertEquals(OBJECT_JSON_ARRAY, serializedObject); } - private static class TestClass { + private static final class TestClass { private final Color color; private final int i; @@ -77,11 +64,15 @@ public class GsonTypeHandlerAdapterTest { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } TestClass testClass = (TestClass) o; - return i == testClass.i && - Objects.equals(color, testClass.color); + return i == testClass.i + && Objects.equals(color, testClass.color); } } } diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java index ae0e85687..daca4ff7b 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class GsonTypeHandlerLibraryAdapterFactoryTest { private static final TestClass OBJECT = new TestClass( new Color(0xDEADBEEF), - ImmutableSet.of(new Vector4f(0,0,0,0), new Vector4f(1,1,1,1)), + ImmutableSet.of(new Vector4f(0, 0, 0, 0), new Vector4f(1, 1, 1, 1)), ImmutableMap.of( "someRect", new Rectanglei(-3, -3).setSize(10, 10) @@ -57,14 +57,11 @@ public class GsonTypeHandlerLibraryAdapterFactoryTest { assertEquals(OBJECT, deserializedObject); } - private static class TestClass { + private static final class TestClass { private final Color color; private final Set vector4fs; private final Map rectangleiMap; - // Will not be serialized - private final Map intMap; - private final int i; private TestClass(Color color, Set vector4fs, Map rectangleiMap, @@ -72,19 +69,23 @@ public class GsonTypeHandlerLibraryAdapterFactoryTest { this.color = color; this.vector4fs = vector4fs; this.rectangleiMap = rectangleiMap; - this.intMap = intMap; + // Will not be serialized this.i = i; } @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } TestClass testClass = (TestClass) o; - return i == testClass.i && - Objects.equals(color, testClass.color) && - Objects.equals(vector4fs, testClass.vector4fs) && - Objects.equals(rectangleiMap, testClass.rectangleiMap); + return i == testClass.i + && Objects.equals(color, testClass.color) + && Objects.equals(vector4fs, testClass.vector4fs) + && Objects.equals(rectangleiMap, testClass.rectangleiMap); } } } diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java index c3cba22dd..e2675b4ff 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.common.collect.Lists; @@ -41,9 +28,7 @@ public class PolymorphicTypeAdapterFactoryTest { @Test public void testInterfaceReference() { - Walker walker = CAT; - - String json = interfaceGson.toJson(walker); + String json = interfaceGson.toJson(CAT); Walker newAnimal = interfaceGson.fromJson(json, Walker.class); @@ -52,9 +37,7 @@ public class PolymorphicTypeAdapterFactoryTest { @Test public void testBaseClassReference() { - Animal animal = CHEETAH; - - String json = baseClassGson.toJson(animal); + String json = baseClassGson.toJson(CHEETAH); Animal newAnimal = baseClassGson.fromJson(json, Animal.class); @@ -98,7 +81,7 @@ public class PolymorphicTypeAdapterFactoryTest { assertTrue(newWalkers.get(2) instanceof Cheetah); } - private static class Capsule { + private static final class Capsule { private final Animal animal; private Capsule(Animal animal) { @@ -118,14 +101,18 @@ public class PolymorphicTypeAdapterFactoryTest { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Animal animal = (Animal) o; return Objects.equals(name, animal.name); } } - private static class Dog extends Animal { + private static final class Dog extends Animal { private final float tailLength; private Dog(float tailLength) { @@ -135,9 +122,15 @@ public class PolymorphicTypeAdapterFactoryTest { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } Dog dog = (Dog) o; return Float.compare(dog.tailLength, tailLength) == 0; } @@ -153,9 +146,15 @@ public class PolymorphicTypeAdapterFactoryTest { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } Cheetah cheetah = (Cheetah) o; return spotCount == cheetah.spotCount; } diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java index 436365cdf..e37306f17 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java @@ -1,18 +1,5 @@ -/* -# * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.mathTypes; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java b/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java index 6b23961c1..b84254bd5 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java b/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java index dd9d79feb..355dd159e 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection.copy.strategy; import com.google.common.collect.Maps; @@ -26,8 +13,6 @@ import java.util.Set; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class MapCopyStrategyTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java b/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java index 124b28f7a..3e15c3c52 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java @@ -15,8 +15,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ByteCodeReflectFactoryTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java b/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java index 6e794c9a7..2101a4833 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java @@ -14,7 +14,7 @@ public class ConstructorLibraryTest { @Test public void testArray() { - ObjectConstructor[]> constructor = library.get(new TypeInfo[]>() {}); + ObjectConstructor[]> constructor = library.get(new TypeInfo[]>() { }); List[] constructed = constructor.construct(); @@ -23,7 +23,7 @@ public class ConstructorLibraryTest { @Test public void testMultidimensionalArray() { - ObjectConstructor constructor = library.get(new TypeInfo() {}); + ObjectConstructor constructor = library.get(new TypeInfo() { }); String[][] constructed = constructor.construct(); diff --git a/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java b/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java index 47ea20211..e44c5439b 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java +++ b/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java @@ -1,22 +1,7 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection.reflect; -/** - */ public final class PrivateComponent { private PrivateComponent() { diff --git a/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java b/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java index 254983146..dad430233 100644 --- a/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java +++ b/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; diff --git a/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java b/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java index 2247bd70b..efb4672d2 100644 --- a/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java +++ b/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java b/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java index fc88ab7ae..192ce6ee2 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering; diff --git a/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java b/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java index 3839cba88..c6900b355 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.animation; diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java index 6466b0e91..dba7a56ff 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.assets.texture; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java index 0ed59087e..df51dcffb 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.assets.texture; diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java index c9ae9faae..4e3917cea 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.assets.texture; import org.junit.jupiter.api.Test; @@ -27,8 +14,6 @@ import java.nio.ByteBuffer; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class TextureDataFactoryTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java index 70e4bc823..60c6e99a0 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java @@ -10,8 +10,6 @@ import org.terasology.nui.Color; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class TextureUtilTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java b/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java index bf5ad4430..a8fcd5bea 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.dag; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java b/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java index f79f6bc06..22fe73a8c 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java +++ b/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.dag; import com.google.common.base.Objects; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java index c3c0302d5..17ae1cd32 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; import org.joml.Vector2i; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java index 679b83a49..995f83c04 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; import org.joml.Vector2i; @@ -112,14 +99,16 @@ public class ColumnLayoutTest { // Gets one-fifth of entire area verify(canvas).drawWidget(itemAt2x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2, ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 2 / 10, 10)); // Gets three-tens of entire area - verify(canvas).drawWidget(itemAt3x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 3 / 10, 10)); + verify(canvas).drawWidget(itemAt3x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, + ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 3 / 10, 10)); // Gets half of entire area verify(canvas).drawWidget(itemAt1x2, RectUtility.createFromMinAndSize(0, ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH / 2, 10)); // Gets one-fifth of entire area verify(canvas).drawWidget(itemAt2x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2, ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH * 2 / 10, 10)); // Gets three-tens of entire area - verify(canvas).drawWidget(itemAt3x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH * 3 / 10, 10)); + verify(canvas).drawWidget(itemAt3x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, + ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH * 3 / 10, 10)); } @Test diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java index 8171c07d8..67796f07e 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; import org.joml.Vector2i; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java index 65ff5fba3..feb689286 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java @@ -1,25 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; -import org.terasology.joml.geom.Rectanglei; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.joml.Vector2f; import org.joml.Vector2i; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.terasology.joml.geom.Rectanglei; import org.terasology.nui.Canvas; import org.terasology.nui.layouts.ZoomableLayout; @@ -114,12 +101,19 @@ public class ZoomableLayoutTest { //world size scaled to fit ratio of screen size - world size now 200 x 100 assertEquals(zoomableLayout.getWindowSize(), new Vector2f(WORLD_WIDTH * 2, WORLD_HEIGHT)); assertEquals(zoomableLayout.getScreenSize(), new Vector2i(CANVAS_WIDTH, CANVAS_HEIGHT)); - assertEquals(zoomableLayout.getPixelSize(), new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2), CANVAS_HEIGHT / WORLD_HEIGHT)); + assertEquals(zoomableLayout.getPixelSize(), + new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2), CANVAS_HEIGHT / WORLD_HEIGHT)); //coordinates on widgets scaled down by half - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x / 2), ceilToInt(pos1.y / 2)), new Vector2i(ceilToInt((pos1.x + size1.x) / 2), ceilToInt((pos1.y + size1.y) / 2)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(ceilToInt(pos2.x / 2), ceilToInt(pos2.y / 2)), new Vector2i(ceilToInt((pos2.x + size2.x) / 2), ceilToInt((pos2.y + size2.y) / 2)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x / 2), ceilToInt(pos3.y / 2)), new Vector2i(ceilToInt((pos3.x + size3.x) / 2), ceilToInt((pos3.y + size3.y) / 2)))); + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x / 2), ceilToInt(pos1.y / 2)), + new Vector2i(ceilToInt((pos1.x + size1.x) / 2), ceilToInt((pos1.y + size1.y) / 2)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(ceilToInt(pos2.x / 2), ceilToInt(pos2.y / 2)), + new Vector2i(ceilToInt((pos2.x + size2.x) / 2), ceilToInt((pos2.y + size2.y) / 2)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x / 2), ceilToInt(pos3.y / 2)), + new Vector2i(ceilToInt((pos3.x + size3.x) / 2), ceilToInt((pos3.y + size3.y) / 2)))); } @@ -135,11 +129,18 @@ public class ZoomableLayoutTest { //world size doubled assertEquals(zoomableLayout.getWindowSize(), new Vector2f(WORLD_WIDTH * 2 * 2, WORLD_HEIGHT * 2)); assertEquals(zoomableLayout.getScreenSize(), new Vector2i(CANVAS_WIDTH, CANVAS_HEIGHT)); - assertEquals(zoomableLayout.getPixelSize(), new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2 * 2), CANVAS_HEIGHT / (WORLD_HEIGHT * 2))); + assertEquals(zoomableLayout.getPixelSize(), + new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2 * 2), CANVAS_HEIGHT / (WORLD_HEIGHT * 2))); - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x / 4), ceilToInt(pos1.y / 4)), new Vector2i(ceilToInt((pos1.x + size1.x) / 4), ceilToInt((pos1.y + size1.y) / 4)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(ceilToInt(pos2.x / 4), ceilToInt(pos2.y / 4)), new Vector2i(ceilToInt((pos2.x + size2.x) / 4), ceilToInt((pos2.y + size2.y) / 4)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x / 4), ceilToInt(pos3.y / 4)), new Vector2i(ceilToInt((pos3.x + size3.x) / 4), ceilToInt((pos3.y + size3.y) / 4)))); + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x / 4), ceilToInt(pos1.y / 4)), + new Vector2i(ceilToInt((pos1.x + size1.x) / 4), ceilToInt((pos1.y + size1.y) / 4)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(ceilToInt(pos2.x / 4), ceilToInt(pos2.y / 4)), + new Vector2i(ceilToInt((pos2.x + size2.x) / 4), ceilToInt((pos2.y + size2.y) / 4)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x / 4), ceilToInt(pos3.y / 4)), + new Vector2i(ceilToInt((pos3.x + size3.x) / 4), ceilToInt((pos3.y + size3.y) / 4)))); } @@ -155,20 +156,33 @@ public class ZoomableLayoutTest { //world size halved assertEquals(zoomableLayout.getWindowSize(), new Vector2f(WORLD_WIDTH, WORLD_HEIGHT / 2)); assertEquals(zoomableLayout.getScreenSize(), new Vector2i(CANVAS_WIDTH, CANVAS_HEIGHT)); - assertEquals(zoomableLayout.getPixelSize(), new Vector2f(CANVAS_WIDTH / WORLD_WIDTH, CANVAS_HEIGHT / (WORLD_HEIGHT / 2))); + assertEquals(zoomableLayout.getPixelSize(), + new Vector2f(CANVAS_WIDTH / WORLD_WIDTH, CANVAS_HEIGHT / (WORLD_HEIGHT / 2))); - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x), ceilToInt(pos1.y)), new Vector2i(ceilToInt(pos1.x + size1.x), ceilToInt(pos1.y + size1.y)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(ceilToInt(pos2.x), ceilToInt(pos2.y)), new Vector2i(ceilToInt(pos2.x + size2.x), ceilToInt(pos2.y + size2.y)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x), ceilToInt(pos3.y)), new Vector2i(ceilToInt(pos3.x + size3.x), ceilToInt(pos3.y + size3.y)))); + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x), ceilToInt(pos1.y)), + new Vector2i(ceilToInt(pos1.x + size1.x), ceilToInt(pos1.y + size1.y)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(ceilToInt(pos2.x), ceilToInt(pos2.y)), + new Vector2i(ceilToInt(pos2.x + size2.x), ceilToInt(pos2.y + size2.y)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x), ceilToInt(pos3.y)), + new Vector2i(ceilToInt(pos3.x + size3.x), ceilToInt(pos3.y + size3.y)))); //simulate drag to item2 zoomableLayout.setWindowPosition(pos2); zoomableLayout.onDraw(canvas); //item1 out of canvas - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x - pos2.x), ceilToInt(pos1.y - pos2.y)), new Vector2i(ceilToInt(pos1.x + size1.x - pos2.x), ceilToInt(pos1.y + size1.y - pos2.y)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(), new Vector2i(ceilToInt(size2.x), ceilToInt(size2.y)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x - pos2.x), ceilToInt(pos3.y - pos2.y)), new Vector2i(ceilToInt(pos3.x + size3.x - pos2.x), ceilToInt(pos3.y + size3.y - pos2.y)))); + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x - pos2.x), ceilToInt(pos1.y - pos2.y)), + new Vector2i(ceilToInt(pos1.x + size1.x - pos2.x), ceilToInt(pos1.y + size1.y - pos2.y)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(), + new Vector2i(ceilToInt(size2.x), ceilToInt(size2.y)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x - pos2.x), ceilToInt(pos3.y - pos2.y)), + new Vector2i(ceilToInt(pos3.x + size3.x - pos2.x), ceilToInt(pos3.y + size3.y - pos2.y)))); } } diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java index 1820b57d9..bbbfbb685 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.browser.data.basic; import org.junit.jupiter.params.ParameterizedTest; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java index b32265f0b..b1decf73e 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.browser.data.basic; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java index 6fa775671..32152dab1 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.browser.data.html; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java index 0690afa5a..48ceeb503 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.treeView; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java index 782341422..e35754f16 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.treeView; import com.google.common.base.Charsets; diff --git a/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java b/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java index 0389fcc4b..c86a297f3 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; diff --git a/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java b/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java index eea530762..99df57425 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java b/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java index 3223b01c0..1e05991c6 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; diff --git a/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java b/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java index 9b9443830..740d53c79 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; import org.junit.jupiter.api.Test; @@ -30,15 +17,13 @@ import java.lang.reflect.WildcardType; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ + public class ReflectionUtilTest { @Test public void testGetClassOfTypeWildcard() { - class C {} + class C { } - ParameterizedType cType = (ParameterizedType) new TypeInfo>() {}.getType(); + ParameterizedType cType = (ParameterizedType) new TypeInfo>() { }.getType(); Type wildcardType = cType.getActualTypeArguments()[0]; assertEquals(Object.class, ReflectionUtil.getRawType(wildcardType)); @@ -56,8 +41,8 @@ public class ReflectionUtilTest { @Test public void testGetParameterForBuriedGenericInterface() { - class Base {} - class Sub extends Base implements MarkerA {} + class Base { } + class Sub extends Base implements MarkerA { } Type parameter = ReflectionUtil.getTypeParameterForSuper(Sub.class, MarkerA.class, 0); @@ -66,7 +51,7 @@ public class ReflectionUtilTest { @Test public void testGetParameterForUnboundGenericInterface() { - Type parameter = ReflectionUtil.getTypeParameterForSuper(new TypeInfo>() {}.getType(), CopyStrategy.class, 0); + Type parameter = ReflectionUtil.getTypeParameterForSuper(new TypeInfo>() { }.getType(), CopyStrategy.class, 0); assertTrue(parameter instanceof WildcardType); } @@ -80,13 +65,13 @@ public class ReflectionUtilTest { } } - class SubClass extends SubInterface {} + class SubClass extends SubInterface { } - Type subInterfaceType = new TypeInfo>() {}.getType(); + Type subInterfaceType = new TypeInfo>() { }.getType(); assertEquals(Integer.class, ReflectionUtil.getTypeParameterForSuper(subInterfaceType, CopyStrategy.class, 0)); - Type subClassType = new TypeInfo() {}.getType(); + Type subClassType = new TypeInfo() { }.getType(); assertEquals(String.class, ReflectionUtil.getTypeParameterForSuper(subClassType, CopyStrategy.class, 0)); } @@ -122,7 +107,7 @@ public class ReflectionUtilTest { typeInfo.getRawType().getDeclaredFields()[0].getGenericType() ); - assertEquals(new TypeInfo>() {}.getType(), resolvedFieldType); + assertEquals(new TypeInfo>() { }.getType(), resolvedFieldType); } @Test @@ -140,7 +125,7 @@ public class ReflectionUtilTest { typeInfo.getRawType().getDeclaredFields()[0].getGenericType() ); - assertEquals(new TypeInfo>() {}.getType(), resolvedFieldType); + assertEquals(new TypeInfo>() { }.getType(), resolvedFieldType); resolvedFieldType = ReflectionUtil.resolveType( typeInfo.getType(), @@ -165,7 +150,7 @@ public class ReflectionUtilTest { typeInfo.getRawType().getDeclaredFields()[0].getGenericType() ); - assertEquals(new TypeInfo>() {}.getType(), resolvedFieldType); + assertEquals(new TypeInfo>() { }.getType(), resolvedFieldType); resolvedFieldType = ReflectionUtil.resolveType( typeInfo.getType(), @@ -223,10 +208,10 @@ public class ReflectionUtilTest { @Test public void testResolveThroughGenericSupertypes() { - class B implements MarkerB, MarkerA {} + class B implements MarkerB, MarkerA { } ParameterizedType resolvedTypeForB = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), ReflectionUtil.parameterizeRawType(B.class) ); @@ -238,21 +223,21 @@ public class ReflectionUtilTest { @Test public void testResolveThroughInheritanceTree() { - class A implements MarkerA, MarkerC {} - class B extends A implements MarkerB, MarkerC {} - class C extends B {} + class A implements MarkerA, MarkerC { } + class B extends A implements MarkerB, MarkerC { } + class C extends B { } final Type typeToResolve = ReflectionUtil.parameterizeRawType(C.class); ParameterizedType resolvedThroughMarkerA = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), typeToResolve ); assertEquals(String.class, resolvedThroughMarkerA.getActualTypeArguments()[0]); ParameterizedType resolvedThroughMarkerB = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), typeToResolve ); @@ -261,20 +246,20 @@ public class ReflectionUtilTest { ParameterizedType resolvedThroughAWithIncorrectFirstType = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), typeToResolve ); assertEquals(String.class, resolvedThroughAWithIncorrectFirstType.getActualTypeArguments()[0]); } - interface MarkerA {} + interface MarkerA { } - interface MarkerB {} + interface MarkerB { } - interface MarkerC {} + interface MarkerC { } - interface GenericInterfaceSubInterface extends CopyStrategy {} + interface GenericInterfaceSubInterface extends CopyStrategy { } public static class UnboundInterfaceImplementor implements CopyStrategy { diff --git a/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java b/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java index 7ca1f932a..d3dd1d350 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; diff --git a/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java b/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java index c0bd77eb8..7fb41dd9a 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities.collection; import com.google.common.collect.ImmutableList; @@ -27,8 +14,6 @@ import java.util.NoSuchElementException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class CircularBufferTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java b/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java index 0e2fe0ecb..76f2bd9c2 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities.time; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java b/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java index f25bd40cc..17cbb5afb 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities.tree; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/world/ChunkTest.java b/engine-tests/src/test/java/org/terasology/world/ChunkTest.java index a665fd6f9..ad2b8cb0b 100644 --- a/engine-tests/src/test/java/org/terasology/world/ChunkTest.java +++ b/engine-tests/src/test/java/org/terasology/world/ChunkTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world; import org.joml.Vector3f; diff --git a/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java b/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java index 37f66af09..5fbd610ae 100644 --- a/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java +++ b/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.Zones; import com.google.common.collect.ArrayListMultimap; diff --git a/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java b/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java index 906513589..0d3343777 100644 --- a/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java +++ b/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.Zones; import org.junit.jupiter.api.BeforeEach; @@ -44,7 +31,7 @@ public class ZoneTest { try { zone.getChildZone("Invalid name"); fail(); - } catch (Exception e) {} + } catch (Exception e) { } assertEquals(child, zone.getChildZone("Child")); } diff --git a/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java b/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java index f507fd7cb..a4106d48e 100644 --- a/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java +++ b/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.world.block; diff --git a/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java b/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java index 136408f96..c5f595923 100644 --- a/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java +++ b/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.block.shape; import com.badlogic.gdx.physics.bullet.collision.btConvexHullShape; diff --git a/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java b/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java index 6b02bda3f..4db81bbb9 100644 --- a/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java +++ b/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.chunks.pipeline; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java b/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java index 40c015d41..5366a8032 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java index b48bde665..65043211c 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java index 568d8de07..0cf73d304 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java index 5878492eb..4cba72a95 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java index 93be03452..4299f295d 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java index fddb5914e..c59378a2c 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java index d68a9fa6e..ec6d64c77 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java index 6929fb674..c24b4419e 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java index 042d69e0e..84807b7f5 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java index 37f27d084..b30eeeb8b 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java b/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java index 40275f82d..ba1dd1534 100644 --- a/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java +++ b/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java @@ -171,7 +171,7 @@ public class BetweenChunkPropagationTest extends TerasologyTestingEnvironment { topChunk.setSunlight(pos, (byte) 0); topChunk.setSunlightRegen(pos, (byte) 0); } - for (Vector3ic pos : new BlockRegion(8, 0, 8).setSize(Chunks.SIZE_X- 16, 1, Chunks.SIZE_Z- 16)) { + for (Vector3ic pos : new BlockRegion(8, 0, 8).setSize(Chunks.SIZE_X - 16, 1, Chunks.SIZE_Z - 16)) { topChunk.setSunlight(pos, (byte) 0); topChunk.setSunlightRegen(pos, (byte) 32); } diff --git a/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java b/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java index 5156843e3..26f27a47e 100644 --- a/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java +++ b/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.propagation; import org.joml.Vector3i; diff --git a/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java b/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java index 2673dec6e..641819472 100644 --- a/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java +++ b/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.propagation; import com.google.common.collect.Maps; @@ -36,10 +23,6 @@ import org.terasology.engine.world.block.loader.BlockFamilyDefinitionData; import org.terasology.engine.world.block.shapes.BlockShape; import org.terasology.engine.world.block.tiles.NullWorldAtlas; import org.terasology.engine.world.chunks.Chunks; -import org.terasology.engine.world.propagation.BatchPropagator; -import org.terasology.engine.world.propagation.BlockChange; -import org.terasology.engine.world.propagation.StandardBatchPropagator; -import org.terasology.engine.world.propagation.SunlightRegenBatchPropagator; import org.terasology.engine.world.propagation.light.SunlightPropagationRules; import org.terasology.engine.world.propagation.light.SunlightRegenPropagationRules; diff --git a/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java b/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java index 8d130ea6f..a021880ec 100644 --- a/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java +++ b/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.time; diff --git a/engine-tests/src/test/resources/logback.xml b/engine-tests/src/test/resources/logback.xml index bea53b30b..9966e57db 100644 --- a/engine-tests/src/test/resources/logback.xml +++ b/engine-tests/src/test/resources/logback.xml @@ -1,3 +1,6 @@ + + + diff --git a/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java b/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java index 8d46fd358..c5dae8d4e 100644 --- a/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java +++ b/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java @@ -17,8 +17,6 @@ package org.terasology.benchmark.reflectFactory; import org.terasology.engine.entitySystem.Component; -/** - */ public class GetterSetterComponent implements Component { private int value; diff --git a/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java b/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java index 333cb30a2..ebd6917be 100644 --- a/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java +++ b/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; /** diff --git a/engine/src/main/java/org/terasology/engine/audio/AudioManager.java b/engine/src/main/java/org/terasology/engine/audio/AudioManager.java index ac9e70d9b..efff39e71 100644 --- a/engine/src/main/java/org/terasology/engine/audio/AudioManager.java +++ b/engine/src/main/java/org/terasology/engine/audio/AudioManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; import org.joml.Quaternionfc; diff --git a/engine/src/main/java/org/terasology/engine/audio/Sound.java b/engine/src/main/java/org/terasology/engine/audio/Sound.java index 4becf5526..f0ce4edf4 100644 --- a/engine/src/main/java/org/terasology/engine/audio/Sound.java +++ b/engine/src/main/java/org/terasology/engine/audio/Sound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; import org.terasology.gestalt.assets.Asset; diff --git a/engine/src/main/java/org/terasology/engine/audio/StaticSound.java b/engine/src/main/java/org/terasology/engine/audio/StaticSound.java index 5d0eb4ef7..a6a8016e6 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StaticSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/StaticSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java b/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java index f410f7193..18b5547f3 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java +++ b/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java b/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java index f51ca0463..2f4c6ef62 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java b/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java index 6245993ff..b8ad39d29 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java +++ b/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java b/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java index 347220ba5..351bc3415 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.events; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java index e194b0d38..7516cc2e8 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.events; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java index 8ccab2940..284e3c18d 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.events; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java index bccae5c27..1cac9a3f3 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 /** * This package provides a low-level system for describing classes and fields, with support for construction and field access. Essentially it is a simplified reflection diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java index 8d40ff2bf..a21196acb 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; import com.jcraft.jogg.Packet; diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java index 98f3e9eae..351654e61 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; @@ -29,8 +16,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; -/** - */ @RegisterAssetFileFormat public class OggSoundFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java index 8ac3a8560..25016ad5e 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; @@ -27,9 +14,7 @@ import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -/** - * - */ + public class OggStreamingSoundData implements StreamingSoundData { private static final Logger logger = LoggerFactory.getLogger(OggStreamingSoundData.class); diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java index b735d8634..c62be8bf6 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; @@ -25,8 +12,6 @@ import org.terasology.gestalt.assets.module.annotations.RegisterAssetFileFormat; import java.io.IOException; import java.util.List; -/** - */ @RegisterAssetFileFormat public class OggStreamingSoundFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java index 6c0c1b524..1aee89c2c 100644 --- a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java +++ b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.nullAudio; diff --git a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java index 895d5987f..6f35ed665 100644 --- a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.nullAudio; import org.terasology.engine.audio.StaticSound; diff --git a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java index 60539317a..b7d84a580 100644 --- a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.nullAudio; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java index 29ff70a1c..184786930 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java index f8dc0c1de..268adbebe 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java index 7a701192b..8b1f83aad 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.lwjgl.openal.AL10; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java index 62db963a4..b9081a759 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java index cdcaaced1..e0fc9d0e6 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.terasology.engine.audio.Sound; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java index 464589b9c..ced598f11 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.joml.Vector3fc; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java index 71ab5321d..e0541c118 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.staticSound; import org.lwjgl.openal.AL10; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java index f47859413..24e09640d 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.staticSound; import org.terasology.engine.audio.openAL.BaseSoundPool; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java index 1ad95682d..699971629 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.staticSound; @@ -28,9 +15,7 @@ import static org.lwjgl.openal.AL10.AL_TRUE; import static org.lwjgl.openal.AL10.alGetSourcei; import static org.lwjgl.openal.AL10.alSourcei; -/** - * - */ + public class OpenALSoundSource extends BaseSoundSource { private OpenALSound audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java index e12b75dbe..ecb91fe6a 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java @@ -35,7 +35,8 @@ public final class OpenALStreamingSound extends StreamingSound { private OpenALStreamingSound.DisposalAction internalResources; private int lastUpdatedBuffer; - public OpenALStreamingSound(ResourceUrn urn, AssetType assetType, StreamingSoundData data, OpenALManager audioManager, OpenALStreamingSound.DisposalAction disposableAction) { + public OpenALStreamingSound(ResourceUrn urn, AssetType assetType, StreamingSoundData data, + OpenALManager audioManager, OpenALStreamingSound.DisposalAction disposableAction) { super(urn, assetType, disposableAction); this.internalResources = disposableAction; this.internalResources.setAsset(this); diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java index 9e02661d8..e7be718bf 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.streamingSound; import org.terasology.engine.audio.openAL.BaseSoundPool; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java index dbee6306a..404668ba0 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.streamingSound; import org.lwjgl.BufferUtils; diff --git a/engine/src/main/java/org/terasology/engine/audio/package-info.java b/engine/src/main/java/org/terasology/engine/audio/package-info.java index 63b3ef3f9..72dd39cde 100644 --- a/engine/src/main/java/org/terasology/engine/audio/package-info.java +++ b/engine/src/main/java/org/terasology/engine/audio/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java b/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java index 7e7a851d1..df61c9f1b 100644 --- a/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java +++ b/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.system; @@ -36,7 +23,6 @@ import org.terasology.engine.logic.permission.PermissionManager; import org.terasology.engine.logic.players.LocalPlayer; import org.terasology.engine.network.ClientComponent; import org.terasology.engine.network.NetworkSystem; -import org.terasology.engine.physics.bullet.BulletPhysics; import org.terasology.engine.registry.In; import org.terasology.engine.utilities.Assets; diff --git a/engine/src/main/java/org/terasology/engine/config/AudioConfig.java b/engine/src/main/java/org/terasology/engine/config/AudioConfig.java index 6ca99ee18..3116b1ebe 100644 --- a/engine/src/main/java/org/terasology/engine/config/AudioConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/AudioConfig.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/BindsConfig.java b/engine/src/main/java/org/terasology/engine/config/BindsConfig.java index 08de3103e..2f1a3ecc5 100644 --- a/engine/src/main/java/org/terasology/engine/config/BindsConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/BindsConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java b/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java index d4ab9bc3b..37f111c19 100644 --- a/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java b/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java index 87f4f7b1c..018db5155 100644 --- a/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.net.URL; diff --git a/engine/src/main/java/org/terasology/engine/config/InputConfig.java b/engine/src/main/java/org/terasology/engine/config/InputConfig.java index b74171cad..890160ade 100644 --- a/engine/src/main/java/org/terasology/engine/config/InputConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/InputConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import org.terasology.engine.context.internal.MockContext; diff --git a/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java b/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java index 5e1690d3f..989cead2b 100644 --- a/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.util.HashMap; diff --git a/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java b/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java index e328665be..e64c6d800 100644 --- a/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; @@ -21,8 +8,6 @@ import org.terasology.gestalt.naming.Name; import java.util.List; -/** - */ public class ModuleConfig { private List modules = Lists.newArrayList(); private String defaultGameplayModuleName = ""; diff --git a/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java b/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java index 4f0871ef8..7a4957d3a 100644 --- a/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java @@ -1,25 +1,10 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.util.Locale; -/** - * - */ + public class NUIEditorConfig { private boolean disableIcons; private boolean disableAutosave; diff --git a/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java b/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java index 366b53534..330431781 100644 --- a/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; @@ -23,8 +10,6 @@ import org.terasology.engine.core.TerasologyConstants; import java.util.Collections; import java.util.List; -/** - */ public class NetworkConfig { private List servers = Lists.newArrayList(new ServerInfo("localhost", "localhost", TerasologyConstants.DEFAULT_PORT)); diff --git a/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java b/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java index 4806c87fc..15ffe5d35 100644 --- a/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.security.SecureRandom; diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java index caa5daab6..31df80689 100644 --- a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java index a740008ec..1470e039c 100644 --- a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.beans.PropertyChangeEvent; @@ -23,8 +10,6 @@ import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.rendering.world.WorldRendererImpl; import org.terasology.engine.utilities.subscribables.AbstractSubscribable; -/** - */ @API public class RenderingDebugConfig extends AbstractSubscribable implements PropertyChangeListener { public static final String WIREFRAME = "wireframe"; diff --git a/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java b/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java index 4b4a702b5..2aa05ab60 100644 --- a/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.collect.Maps; @@ -34,9 +21,7 @@ import java.security.SecurityPermission; import java.util.Collections; import java.util.Map; -/** - * - */ + public class SecurityConfig { public static final SecurityPermission PRIVATE_CERTIFICATE_ACCESS_PERMISSION = new SecurityPermission("PRIVATE_CERTIFICATE_ACCESS_PERMISSION"); public static final SecurityPermission CERTIFICATE_WRITE_PERMISSION = new SecurityPermission("CERTIFICATE_WRITE_PERMISSION"); diff --git a/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java b/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java index 5a570382c..06f9e7d7d 100644 --- a/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.util.Collection; diff --git a/engine/src/main/java/org/terasology/engine/config/ServerInfo.java b/engine/src/main/java/org/terasology/engine/config/ServerInfo.java index e593443d4..e52930415 100644 --- a/engine/src/main/java/org/terasology/engine/config/ServerInfo.java +++ b/engine/src/main/java/org/terasology/engine/config/ServerInfo.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java b/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java index 808620fe6..0382e1e81 100644 --- a/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import org.terasology.engine.telemetry.TelemetryEmitter; diff --git a/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java b/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java index a875a6b6a..9d08f2bfd 100644 --- a/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java b/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java index e87d34e2b..0ef7c4b38 100644 --- a/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java b/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java index 867cf47a2..c32bba13e 100644 --- a/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import org.terasology.engine.core.SimpleUri; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java index 8919763ba..6ab3355f3 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.BindsConfig; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java index 90acaaf98..baff6e793 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.BindsConfig; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java index bec265274..a72290d12 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.Config; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java index 5617aad9b..4dcd2b58f 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.Config; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java index ca3bd1ae4..9ef110e42 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.facade; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java index 42061dcf1..9d67fa1b1 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.facade; import org.terasology.engine.config.TelemetryConfig; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java index e3b3b19d8..0e5453bbd 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java index 570d93b6e..55ce4dee4 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java index 4a6b075e5..0c7d2f10f 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java index 4e1e7258a..1eab7b49f 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; import org.terasology.engine.config.flexible.constraints.SettingConstraint; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java b/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java index dfdf28ee9..02316f060 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; /** diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java index 2fa984c78..22f4d8383 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible.constraints; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java index 534ccf34f..87bab1610 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible.constraints; import org.terasology.engine.config.flexible.Setting; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java index 2462ccdd1..c35bffb92 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.config.flexible.constraints; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/context/Context.java b/engine/src/main/java/org/terasology/engine/context/Context.java index 390c7f9ba..2384ebd6c 100644 --- a/engine/src/main/java/org/terasology/engine/context/Context.java +++ b/engine/src/main/java/org/terasology/engine/context/Context.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.context; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java b/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java index 419e45b7e..28e947723 100644 --- a/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java +++ b/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.context.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java b/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java index dbf2e30ac..f5b5c7ed6 100644 --- a/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java +++ b/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.context.internal; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/EngineTime.java b/engine/src/main/java/org/terasology/engine/core/EngineTime.java index a70894bcf..6314b6dcd 100644 --- a/engine/src/main/java/org/terasology/engine/core/EngineTime.java +++ b/engine/src/main/java/org/terasology/engine/core/EngineTime.java @@ -4,8 +4,6 @@ package org.terasology.engine.core; import java.util.Iterator; -/** - */ public interface EngineTime extends Time { /** diff --git a/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java b/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java index 286bcb597..a30a3baad 100644 --- a/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java +++ b/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core; -/** - */ public enum StandardGameStatus implements EngineStatus { UNSTARTED("Unstarted"), LOADING("Loading"), diff --git a/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java b/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java index da546b39b..3ae42677d 100644 --- a/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java +++ b/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java @@ -84,24 +84,21 @@ import java.util.stream.Collectors; * This GameEngine implementation is the heart of Terasology. *

*

- * It first takes care of making a number of application-wide initializations (see init() - * method). It then provides a main game loop (see run() method) characterized by a number - * of mutually exclusive {@link GameState}s. The current GameState is updated each - * frame, and a change of state (see changeState() method) can be requested at any time - the - * switch will occur cleanly between frames. Interested parties can be notified of GameState - * changes by using the subscribeToStateChange() method. + * It first takes care of making a number of application-wide initializations (see init() method). It then provides a + * main game loop (see run() method) characterized by a number of mutually exclusive {@link GameState}s. The current + * GameState is updated each frame, and a change of state (see changeState() method) can be requested at any time - the + * switch will occur cleanly between frames. Interested parties can be notified of GameState changes by using the + * subscribeToStateChange() method. *

*

- * At this stage the engine also provides a number of utility methods (see submitTask() and - * hasMouseFocus() to name a few) but they might be moved elsewhere. + * At this stage the engine also provides a number of utility methods (see submitTask() and hasMouseFocus() to name a + * few) but they might be moved elsewhere. *

*

- * Special mention must be made in regard to EngineSubsystems. An {@link EngineSubsystem} - * is a pluggable low-level component of the engine, that is processed every frame - like - * rendering or audio. A list of EngineSubsystems is provided in input to the engine's - * constructor. Different sets of Subsystems can significantly change the behaviour of - * the engine, i.e. providing a "no-frills" server in one case or a full-graphics client - * in another. + * Special mention must be made in regard to EngineSubsystems. An {@link EngineSubsystem} is a pluggable low-level + * component of the engine, that is processed every frame - like rendering or audio. A list of EngineSubsystems is + * provided in input to the engine's constructor. Different sets of Subsystems can significantly change the behaviour of + * the engine, i.e. providing a "no-frills" server in one case or a full-graphics client in another. *

*/ public class TerasologyEngine implements GameEngine { @@ -133,9 +130,8 @@ public class TerasologyEngine implements GameEngine { private Context rootContext; /** - * This constructor initializes the engine by initializing its systems, - * subsystems and managers. It also verifies that some required systems - * are up and running after they have been initialized. + * This constructor initializes the engine by initializing its systems, subsystems and managers. It also verifies + * that some required systems are up and running after they have been initialized. * * @param timeSubsystem the timer subsystem * @param subsystems other typical subsystems, e.g., graphics, audio and input subsystems. @@ -195,7 +191,9 @@ public class TerasologyEngine implements GameEngine { } /** - * Provide ability to set additional engine classpath locations. This must be called before initialize() or run(). + * Provide ability to set additional engine classpath locations. This must be called before initialize() or + * run(). + * * @param clazz any class that appears in the resource location to treat as an engine classpath. */ protected void addToClassesOnClasspathsToAddToEngine(Class clazz) { @@ -210,7 +208,8 @@ public class TerasologyEngine implements GameEngine { logger.info("Initializing Terasology..."); logEnvironmentInfo(); - // TODO: Need to get everything thread safe and get rid of the concept of "GameThread" as much as possible. + // TODO: Need to get everything thread safe and get rid of the concept of "GameThread" as much as + // possible. GameThread.setToCurrentThread(); preInitSubsystems(); @@ -263,8 +262,10 @@ public class TerasologyEngine implements GameEngine { logger.info("Home path: {}", PathManager.getInstance().getHomePath()); logger.info("Install path: {}", PathManager.getInstance().getInstallPath()); logger.info("Java: {} in {}", System.getProperty("java.version"), System.getProperty("java.home")); - logger.info("Java VM: {}, version: {}", System.getProperty("java.vm.name"), System.getProperty("java.vm.version")); - logger.info("OS: {}, arch: {}, version: {}", System.getProperty("os.name"), System.getProperty("os.arch"), System.getProperty("os.version")); + logger.info("Java VM: {}, version: {}", System.getProperty("java.vm.name"), System.getProperty("java.vm" + + ".version")); + logger.info("OS: {}, arch: {}, version: {}", System.getProperty("os.name"), System.getProperty("os.arch"), + System.getProperty("os.version")); logger.info("Max. Memory: {} MiB", Runtime.getRuntime().maxMemory() / ONE_MEBIBYTE); logger.info("Processors: {}", Runtime.getRuntime().availableProcessors()); if (NonNativeJVMDetector.JVM_ARCH_IS_NONNATIVE) { @@ -316,10 +317,12 @@ public class TerasologyEngine implements GameEngine { private void initManagers() { changeStatus(TerasologyEngineStatus.INITIALIZING_MODULE_MANAGER); - TypeRegistry.WHITELISTED_CLASSES = ExternalApiWhitelist.CLASSES.stream().map(Class::getName).collect(Collectors.toSet()); + TypeRegistry.WHITELISTED_CLASSES = + ExternalApiWhitelist.CLASSES.stream().map(Class::getName).collect(Collectors.toSet()); TypeRegistry.WHITELISTED_PACKAGES = ExternalApiWhitelist.PACKAGES; - ModuleManager moduleManager = new ModuleManager(rootContext.get(Config.class), classesOnClasspathsToAddToEngine); + ModuleManager moduleManager = new ModuleManager(rootContext.get(Config.class), + classesOnClasspathsToAddToEngine); ModuleTypeRegistry typeRegistry = new ModuleTypeRegistry(moduleManager.getEnvironment()); rootContext.put(ModuleTypeRegistry.class, typeRegistry); @@ -333,7 +336,8 @@ public class TerasologyEngine implements GameEngine { CopyStrategyLibrary copyStrategyLibrary = new CopyStrategyLibrary(reflectFactory); rootContext.put(CopyStrategyLibrary.class, copyStrategyLibrary); - rootContext.put(TypeHandlerLibrary.class, TypeHandlerLibraryImpl.forModuleEnvironment(moduleManager, typeRegistry)); + rootContext.put(TypeHandlerLibrary.class, TypeHandlerLibraryImpl.forModuleEnvironment(moduleManager, + typeRegistry)); changeStatus(TerasologyEngineStatus.INITIALIZING_ASSET_TYPES); assetTypeManager = new AutoReloadAssetTypeManager(); @@ -351,7 +355,8 @@ public class TerasologyEngine implements GameEngine { assetTypeManager.createAssetType(BlockSounds.class, BlockSounds::new, "blockSounds"); assetTypeManager.createAssetType(BlockTile.class, BlockTile::new, "blockTiles"); - AssetType blockFamilyDefinitionAssetType = assetTypeManager.createAssetType(BlockFamilyDefinition.class, BlockFamilyDefinition::new, "blocks"); + AssetType blockFamilyDefinitionAssetType = + assetTypeManager.createAssetType(BlockFamilyDefinition.class, BlockFamilyDefinition::new, "blocks"); assetTypeManager.getAssetFileDataProducer(blockFamilyDefinitionAssetType).addAssetFormat( new BlockFamilyDefinitionFormat(assetTypeManager.getAssetManager())); @@ -389,13 +394,11 @@ public class TerasologyEngine implements GameEngine { } /** - * Runs the engine, including its main loop. This method is called only once per - * application startup, which is the reason the GameState provided is the -initial- - * state rather than a generic game state. + * Runs the engine, including its main loop. This method is called only once per application startup, which is the + * reason the GameState provided is the -initial- state rather than a generic game state. * - * @param initialState In at least one context (the PC facade) the GameState - * implementation provided as input may vary, depending if - * the application has or hasn't been started headless. + * @param initialState In at least one context (the PC facade) the GameState implementation provided as + * input may vary, depending if the application has or hasn't been started headless. */ @Override public synchronized void run(GameState initialState) { @@ -451,9 +454,8 @@ public class TerasologyEngine implements GameEngine { } /** - * The main loop runs until the EngineState is set back to INITIALIZED by shutdown() - * or until the OS requests the application's window to be closed. Engine cleanup - * and disposal occur afterwards. + * The main loop runs until the EngineState is set back to INITIALIZED by shutdown() or until the OS requests the + * application's window to be closed. Engine cleanup and disposal occur afterwards. */ private void mainLoop() { PerformanceMonitor.startActivity("Other"); @@ -466,6 +468,7 @@ public class TerasologyEngine implements GameEngine { /** * Runs a single "tick" of the engine + * * @return true if the loop requesting a tick should continue running */ public boolean tick() { @@ -547,8 +550,8 @@ public class TerasologyEngine implements GameEngine { } /** - * Causes the main loop to stop at the end of the current frame, cleanly ending - * the current GameState, all running task threads and disposing subsystems. + * Causes the main loop to stop at the end of the current frame, cleanly ending the current GameState, all running + * task threads and disposing subsystems. */ @Override public void shutdown() { @@ -556,12 +559,11 @@ public class TerasologyEngine implements GameEngine { } /** - * Changes the game state, i.e. to switch from the MainMenu to Ingame via Loading screen - * (each is a GameState). The change can be immediate, if there is no current game - * state set, or scheduled, when a current state exists and the new state is stored as - * pending. That been said, scheduled changes occurs in the main loop through the call - * processStateChanges(). As such, from a user perspective in normal circumstances, - * scheduled changes are likely to be perceived as immediate. + * Changes the game state, i.e. to switch from the MainMenu to Ingame via Loading screen (each is a GameState). The + * change can be immediate, if there is no current game state set, or scheduled, when a current state exists and the + * new state is stored as pending. That been said, scheduled changes occurs in the main loop through the call + * processStateChanges(). As such, from a user perspective in normal circumstances, scheduled changes are likely to + * be perceived as immediate. */ @Override public void changeState(GameState newState) { @@ -626,10 +628,10 @@ public class TerasologyEngine implements GameEngine { } /** - * Allows it to obtain objects directly from the context of the game engine. It exists only for situations in - * which no child context exists yet. If there is a child context then it automatically contains the objects of - * the engine context. Thus normal code should just work with the (child) context that is available to it - * instead of using this method. + * Allows it to obtain objects directly from the context of the game engine. It exists only for situations in which + * no child context exists yet. If there is a child context then it automatically contains the objects of the engine + * context. Thus normal code should just work with the (child) context that is available to it instead of using this + * method. * * @return a object directly from the context of the game engine */ diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java index fb4e6e81a..8d8a904c6 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.bootstrap; diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java index fec9684c4..a0a3e00da 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.bootstrap; diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java index 8fb7592fd..84b688f87 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java @@ -58,7 +58,6 @@ import static com.google.common.base.Verify.verifyNotNull; */ public final class EntitySystemSetupUtil { - private EntitySystemSetupUtil() { // static utility class, no instance needed } @@ -129,7 +128,9 @@ public final class EntitySystemSetupUtil { CharacterStateEventPositionMap characterStateEventPositionMap = context.get(CharacterStateEventPositionMap.class); DirectionAndOriginPosRecorderList directionAndOriginPosRecorderList = context.get(DirectionAndOriginPosRecorderList.class); RecordedEventStore recordedEventStore = new RecordedEventStore(); - RecordAndReplaySerializer recordAndReplaySerializer = new RecordAndReplaySerializer(entityManager, recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); + RecordAndReplaySerializer recordAndReplaySerializer = + new RecordAndReplaySerializer(entityManager, recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, + directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); context.put(RecordAndReplaySerializer.class, recordAndReplaySerializer); diff --git a/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java b/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java index d00ed55d4..a4fa989b0 100644 --- a/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java +++ b/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.internal; import com.google.common.util.concurrent.AtomicDouble; diff --git a/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java b/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java index 572f90fda..6d7f9b0c4 100644 --- a/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java +++ b/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.internal; import org.lwjgl.glfw.GLFW; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/GameState.java b/engine/src/main/java/org/terasology/engine/core/modes/GameState.java index 6fc482e98..cee0b77dc 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/GameState.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/GameState.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java index 0092e7592..2c00f0bfb 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; -/** - */ public interface LoadProcess { /** diff --git a/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java index 3204e840c..3a89ba2e9 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java @@ -1,22 +1,7 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; -/** - */ public abstract class SingleStepLoadProcess implements LoadProcess { @Override diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java b/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java index a6212837b..5ec94ad18 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; import org.terasology.engine.audio.AudioManager; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java b/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java index 986e85d3f..f6ea5ff83 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java b/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java index 0a61fd612..da49c2338 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java index 7948f0a81..2795c1d6a 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; /** diff --git a/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java index cb7809b81..90f3e7410 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; /** diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java index 2a979890d..96bfdf470 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java index fe641205b..a180de6f2 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java index 2774c5a68..c9bda386f 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java index 7386d2865..633f2b18f 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -34,8 +21,6 @@ import org.terasology.engine.world.generator.WorldGenerator; import java.util.Iterator; -/** - */ public class CreateWorldEntity extends SingleStepLoadProcess { private static final Logger logger = LoggerFactory.getLogger(CreateWorldEntity.class); diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java index c46f744f4..772ba2a18 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java index 704ca6d39..c450cd635 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java index c0d63ec9d..1f4407cb9 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java index 72b1d5037..381af3741 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java index cf2156ef2..50925a5bc 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -20,8 +7,6 @@ import org.terasology.engine.context.Context; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.modes.SingleStepLoadProcess; -/** - */ public class InitialiseEntitySystem extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java index 0c3cc1494..2ddd6e90c 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java @@ -8,8 +8,6 @@ import org.terasology.engine.core.modes.SingleStepLoadProcess; import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.internal.NUIManagerInternal; -/** - */ public class InitialiseGraphics extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java index b959925c1..aeb86b358 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; @@ -21,8 +8,6 @@ import org.terasology.engine.physics.Physics; import org.terasology.engine.physics.engine.PhysicsEngine; import org.terasology.engine.physics.engine.PhysicsEngineManager; -/** - */ public class InitialisePhysics extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java index fab4809ad..929367ce0 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java index 20f7d8ca4..8173b35b3 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java index d514b8515..0d915a995 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -25,8 +12,6 @@ import org.terasology.engine.entitySystem.metadata.EventLibrary; import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.world.BlockEntityRegistry; -/** - */ public class InitialiseSystems extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java index 2f57c162c..8089a9696 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java @@ -117,8 +117,10 @@ public class InitialiseWorld extends SingleStepLoadProcess { RecordAndReplayCurrentStatus recordAndReplayCurrentStatus = context.get(RecordAndReplayCurrentStatus.class); try { storageManager = writeSaveGamesEnabled - ? new ReadWriteStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, extraDataManager, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus) - : new ReadOnlyStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, extraDataManager); + ? new ReadWriteStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, + extraDataManager, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus) + : new ReadOnlyStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, + extraDataManager); } catch (IOException e) { logger.error("Unable to create storage manager!", e); context.get(GameEngine.class).changeState(new StateMainMenu("Unable to create storage manager!")); @@ -136,7 +138,8 @@ public class InitialiseWorld extends SingleStepLoadProcess { context.get(ComponentSystemManager.class).register(relevanceSystem, "engine:relevanceSystem"); chunkProvider.setRelevanceSystem(relevanceSystem); Block unloadedBlock = blockManager.getBlock(BlockManager.UNLOADED_ID); - WorldProviderCoreImpl worldProviderCore = new WorldProviderCoreImpl(worldInfo, chunkProvider, unloadedBlock, context); + WorldProviderCoreImpl worldProviderCore = new WorldProviderCoreImpl(worldInfo, chunkProvider, unloadedBlock, + context); EntityAwareWorldProvider entityWorldProvider = new EntityAwareWorldProvider(worldProviderCore, context); WorldProvider worldProvider = new WorldProviderWrapper(entityWorldProvider, extraDataManager); context.put(WorldProvider.class, worldProvider); @@ -160,7 +163,8 @@ public class InitialiseWorld extends SingleStepLoadProcess { // TODO: These shouldn't be done here, nor so strongly tied to the world renderer LocalPlayer localPlayer = new LocalPlayer(); - localPlayer.setRecordAndReplayClasses(context.get(DirectionAndOriginPosRecorderList.class), context.get(RecordAndReplayCurrentStatus.class)); + localPlayer.setRecordAndReplayClasses(context.get(DirectionAndOriginPosRecorderList.class), + context.get(RecordAndReplayCurrentStatus.class)); context.put(LocalPlayer.class, localPlayer); context.put(Camera.class, worldRenderer.getActiveCamera()); diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java index 82b890e9b..994b137d4 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java index 19b47b072..77a1dc0de 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java index 9d429eda3..785100b4f 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java index a5f8f19d9..7f7cddb7b 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java index 823568dbe..a23c640b9 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java index d54f2b267..604854f09 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java index 46b2f06a3..12ffd4269 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java index 1346928ea..3cdf4201e 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java index 486f3a3d1..f5569022b 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -60,7 +47,7 @@ public class PrepareWorld extends VariableStepLoadProcess { @Override public float getProgress() { - return (1/Math.max(1f, 5000f / (float) timeElapsed)); + return (1 / Math.max(1f, 5000f / (float) timeElapsed)); } @Override diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java index 8126ef6ac..8f3901eee 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; @@ -22,8 +9,6 @@ import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.block.internal.BlockManagerImpl; import org.terasology.engine.world.block.internal.BlockPrefabManager; -/** - */ public class ProcessBlockPrefabs extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java index efecf6c20..15c7aae8b 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java index 9a37a1e77..ce2afcbff 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java @@ -22,8 +22,6 @@ import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.gestalt.module.ModuleEnvironment; import org.terasology.persistence.typeHandling.TypeHandlerLibrary; -/** - */ public class RegisterBlocks extends SingleStepLoadProcess { private final Context context; private final GameManifest gameManifest; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java index b71a4dd63..88cdc401d 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -23,8 +10,6 @@ import org.terasology.engine.input.InputSystem; import org.terasology.engine.input.cameraTarget.CameraTargetSystem; import org.terasology.engine.logic.players.LocalPlayerSystem; -/** - */ public class RegisterInputSystem extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java index 83fef13f4..d8d42b639 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -36,8 +23,6 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -/** - */ public class RegisterMods extends SingleStepLoadProcess { private static final Logger logger = LoggerFactory.getLogger(RegisterMods.class); diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java index 7776d58d8..668ef91ab 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -25,8 +12,6 @@ import org.terasology.engine.core.module.ModuleManager; import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.network.NetworkMode; -/** - */ public class RegisterSystems extends SingleStepLoadProcess { private final Context context; private final NetworkMode netMode; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java index 01dc362f4..d4954b35e 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java @@ -10,8 +10,6 @@ import org.terasology.engine.logic.players.LocalPlayer; import org.terasology.engine.network.Client; import org.terasology.engine.network.NetworkSystem; -/** - */ public class SetupLocalPlayer extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java index 4178467f3..e05ade913 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -23,8 +10,6 @@ import org.terasology.engine.logic.players.LocalPlayer; import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.network.internal.NetworkSystemImpl; -/** - */ public class SetupRemotePlayer extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java index 6f38e113a..316db292f 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -24,8 +11,6 @@ import org.terasology.engine.network.exceptions.HostingFailedException; import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.layers.mainMenu.MessagePopup; -/** - */ public class StartServer extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java b/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java index d54f14075..d61ad4838 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java +++ b/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; public class DependencyResolutionFailedException extends Exception { diff --git a/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java index 9a9349976..fa8aa84cc 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.gestalt.module.Module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java index 095d91aa1..1f5b780ba 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java @@ -1,26 +1,11 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.engine.registry.CoreRegistry; import org.terasology.gestalt.module.Module; import org.terasology.gestalt.naming.Name; -/** - */ public final class ModuleContext { private static ThreadLocal context = new ThreadLocal<>(); diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java index 46d92ea92..a306c370b 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.engine.core.TerasologyConstants; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java index da90f488c..6d93b741b 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java index ebf08c196..7533f921f 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java index a6a14b755..2f63ba1e9 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.engine.utilities.download.MultiFileTransferProgressListener; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java index 7bf974fcd..6cb1730c3 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java index a63544668..3667eb243 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java index a53d55b82..1b89b0ace 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java index be4f1c9a7..071ae0996 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java b/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java index 6b9b1a59a..0df183681 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java +++ b/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import java.util.Locale; -/** - */ public final class UriUtil { private UriUtil() { diff --git a/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java b/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java index 5045c94c3..c5bffcddc 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java +++ b/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module.rendering; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java b/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java index 7dfcd1db3..97bb7303e 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java +++ b/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.core.module.rendering; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java index b4522d5ab..26c2c6598 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java index 33e9c3031..df9016015 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java index 5c4aaade4..151b3b61c 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java b/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java index 57f58e81c..63ac74742 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java b/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java index 1148fcd78..a43f29236 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; public interface Resolution { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java index e2a4d1ddd..8babda7e2 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.GameEngine; import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.logic.console.commandSystem.adapter.ParameterAdapterManager; -/** - * - */ + public class CommandSubsystem implements EngineSubsystem { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java index de242db00..388704358 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.GameEngine; import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.game.Game; -/** - * - */ + // TODO: Get rid of this subsystem, it is kind of silly (remove Game class, convert to entity?) public class GameSubsystem implements EngineSubsystem { @Override diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java index 10b10586b..30fb518f7 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.config.SystemConfig; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java index e352c9da5..779693879 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -24,9 +11,7 @@ import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.network.internal.NetworkSystemImpl; import org.terasology.engine.network.internal.ServerConnectListManager; -/** - * - */ + public class NetworkSubsystem implements EngineSubsystem { private NetworkSystem networkSystem; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java index 9ca332433..d2054efaf 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.GameEngine; import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.physics.CollisionGroupManager; -/** - * - */ + public class PhysicsSubsystem implements EngineSubsystem { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java index 0c2c0b4cc..3b02f06df 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import ch.qos.logback.classic.LoggerContext; @@ -37,9 +24,12 @@ import static org.terasology.engine.telemetry.TelemetryEmitter.DEFAULT_COLLECTOR import static org.terasology.engine.telemetry.TelemetryEmitter.DEFAULT_COLLECTOR_PROTOCOL; /** - * This is a telemetry engine sub system. - * It will initialise all the telemetry stuff such as the {@link com.snowplowanalytics.snowplow.tracker.emitter.Emitter} and configure the {@link org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender}. - * It will also adds the {@link org.terasology.engine.telemetry.Metrics} and the {@link org.terasology.engine.telemetry.TelemetryEmitter} to the context so that we can be use them later in other class for telemetry. + * This is a telemetry engine sub system. It will initialise all the telemetry stuff such as the {@link + * com.snowplowanalytics.snowplow.tracker.emitter.Emitter} and configure the {@link + * org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender}. It will also adds the {@link + * org.terasology.engine.telemetry.Metrics} and the {@link org.terasology.engine.telemetry.TelemetryEmitter} to the + * context so that we can be use them later in other class for telemetry. + * * @see https://github.com/GabrielXia/telemetry/wiki */ public class TelemetrySubSystem implements EngineSubsystem { @@ -91,7 +81,8 @@ public class TelemetrySubSystem implements EngineSubsystem { TelemetryConfig telemetryConfig = config.getTelemetryConfig(); String errorReportingDestination = telemetryConfig.getErrorReportingDestination(); if (errorReportingDestination == null) { - errorReportingDestination = TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST + ":" + TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT; + errorReportingDestination = + TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST + ":" + TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT; telemetryConfig.setErrorReportingDestination(errorReportingDestination); } if (telemetryConfig.isErrorReportingEnabled()) { @@ -117,7 +108,7 @@ public class TelemetrySubSystem implements EngineSubsystem { DEFAULT_COLLECTOR_PROTOCOL, DEFAULT_COLLECTOR_HOST, DEFAULT_COLLECTOR_PORT).toString()); } } - + @Override public void shutdown() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java index 842a5a725..c7ad6d73a 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java index 4d563fac0..3388ca5e8 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.slf4j.Logger; @@ -27,8 +14,6 @@ import org.terasology.engine.utilities.concurrency.TaskMaster; import java.util.concurrent.RejectedExecutionException; -/** - */ public class ThreadManagerSubsystem implements EngineSubsystem, ThreadManager { private static final int MAX_NUMBER_THREADS = 16; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java index fffe512b5..687abd31e 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.core.EngineTime; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java index 7029a44d2..2fcc2f0c0 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.GameEngine; import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.world.generator.internal.WorldGeneratorManager; -/** - * - */ + public class WorldGenerationSubsystem implements EngineSubsystem { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java index 7feacafb5..fc6909ecf 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java @@ -1,25 +1,10 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common.hibernation; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class HibernationManager { private boolean hibernationAllowed = true; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java index fe06b88dc..f25be210d 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common.hibernation; import org.slf4j.Logger; @@ -22,9 +9,7 @@ import org.terasology.engine.core.modes.GameState; import org.terasology.engine.core.subsystem.DisplayDevice; import org.terasology.engine.core.subsystem.EngineSubsystem; -/** - * - */ + public class HibernationSubsystem implements EngineSubsystem { private static final Logger logger = LoggerFactory.getLogger(HibernationSubsystem.class); private HibernationManager hibernationManager; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java index 85dd91111..a28194a83 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.core.subsystem.config; import org.terasology.engine.config.BindsConfig; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java index 1b73eba85..cc0283785 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.config; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java index f410b9000..83aaf7d06 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java index cfb7e9212..52ec44fd9 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java index ff149a6bf..26d3dff59 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java index af5bcc529..6057d7fe6 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import org.joml.Matrix3fc; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java index cb4029ea6..59f15a93f 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import gnu.trove.list.TFloatList; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java index 805de17da..7b7a446ca 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import org.terasology.engine.rendering.assets.shader.Shader; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java index f65883594..df2006f58 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import org.terasology.engine.rendering.assets.skeletalmesh.Bone; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java index 455d4ce36..a43db95a2 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java index 9b41e8be2..c12d31ef4 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.device; import org.terasology.engine.core.subsystem.DisplayDevice; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java index ab1bfcfce..da61f2fc2 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.device; import org.terasology.engine.core.subsystem.Resolution; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java index 520c9912b..a0c48a60f 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.device; import org.terasology.engine.core.internal.TimeBase; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java index 84183277f..2cf634355 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.mode; import org.terasology.engine.core.StateChangeSubscriber; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java index 5d96deac3..ce3c01478 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.mode; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java index fe712cd6b..fde0457ce 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java index 6abf98dfd..ccd59aa74 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java index 01aee972b..2c8d0ab9b 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; import org.terasology.engine.config.RenderingConfig; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java index d015322e2..141d6f8a3 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; import org.terasology.engine.rendering.ShaderManager; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java index b9b7f934d..4d557769a 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import com.google.common.base.Charsets; @@ -25,9 +12,7 @@ import org.terasology.engine.core.subsystem.EngineSubsystem; import java.io.PrintStream; import java.io.UnsupportedEncodingException; -/** - * - */ + public abstract class BaseLwjglSubsystem implements EngineSubsystem { private static final Logger logger = LoggerFactory.getLogger(BaseLwjglSubsystem.class); diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java index 4760388a2..0fb8769e6 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.lwjgl.system.MemoryUtil; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java index 5c3d7048f..58022aba1 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java @@ -1,3 +1,6 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java index b80769599..689bdf335 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java index 3899b0cd9..e579a881d 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import com.google.common.base.Suppliers; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java index 8134ca393..29b1e877f 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java @@ -99,7 +99,7 @@ public class LwjglGraphics extends BaseLwjglSubsystem { int[] heightBuffer = new int[1]; GLFW.glfwGetWindowSize(window, widthBuffer, heightBuffer); - if (widthBuffer[0]>0 && heightBuffer[0]>0 && xBuffer[0]>0 && yBuffer[0]>0) { + if (widthBuffer[0] > 0 && heightBuffer[0] > 0 && xBuffer[0] > 0 && yBuffer[0] > 0) { config.setWindowWidth(widthBuffer[0]); config.setWindowHeight(heightBuffer[0]); config.setWindowPosX(xBuffer[0]); diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java index 4deee0cfd..b71b200f9 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java index c3021d182..d161ab02e 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java index dd1e618ef..10259acd0 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.lwjgl.BufferUtils; @@ -40,9 +27,7 @@ import static org.lwjgl.opengl.GL11.GL_REPEAT; import static org.lwjgl.opengl.GL11.glDepthFunc; import static org.lwjgl.opengl.GL11.glEnable; -/** - * - */ + public final class LwjglGraphicsUtil { private LwjglGraphicsUtil() { } diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java index 2829bcbaf..77245b4db 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java index 917c96c31..18e87516f 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java index 758772e7c..e9d4f0059 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java index 91c167b7c..bb568dda5 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java index 8d7abcccb..87f752591 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.openvr; import jopenvr.VRControllerState_t; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java index ed0a20b57..65e245629 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.openvr; import org.lwjgl.glfw.GLFW; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java index 236a405b2..d300558d5 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.rendering; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/Component.java b/engine/src/main/java/org/terasology/engine/entitySystem/Component.java index 66dc9f8fd..70eef49bb 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/Component.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/Component.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java b/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java index 822ceb6d7..4ab51cf42 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; import java.util.List; -/** - */ public interface ComponentContainer { /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java b/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java index 08a0efad1..a97a36f49 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; import java.util.Optional; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java b/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java index 7e6a32560..58d993eef 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java index 75676102d..08cb56b82 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java index c1608971e..27c5d25c6 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import org.joml.Quaternionfc; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java index 3a722cfae..f4c64b918 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import com.google.common.base.Objects; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java index 87c4623b6..fe3a4922e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java index 06a61f3f8..1c208615f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java index b2d1abc96..e206778fc 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; public interface SectorManager extends EntityPool { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java index c0d7f1205..15b955e1a 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.slf4j.Logger; @@ -36,8 +23,6 @@ import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHU import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.SECTOR; -/** - */ public abstract class BaseEntityRef extends EntityRef { private static final Logger logger = LoggerFactory.getLogger(BaseEntityRef.class); diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java index b870be673..2201e9bd0 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java index ff49f8844..95bb99fc4 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java @@ -1,24 +1,9 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; -/** - */ public class DefaultRefStrategy implements RefStrategy { @Override public BaseEntityRef createRefFor(long id, LowLevelEntityManager entityManager) { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java index 44c24514b..973e839be 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java index 817a362c9..f217dca2e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.SectorManager; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java index 07d18ecf8..612c4930e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java index e8399c366..53aa28f67 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java index 5a1ce1a7f..b0aabe4d3 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java index 7c19845fb..958d4f255 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import gnu.trove.iterator.TLongIterator; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java index 5a70c7c4f..e723c2a0e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java index 9e42a31d8..d2ef1c28b 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java index 37ac39db3..f4041f8e2 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Sets; @@ -26,8 +13,6 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -/** - */ public final class OwnershipHelper { private ComponentLibrary componentLibrary; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java index c725d500e..804a995ff 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java index 4a5690402..96d3b7f92 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.EntityRef; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.engine.network.NetworkComponent; -/** - */ public class PojoEntityRef extends BaseEntityRef { private long id; private boolean exists = true; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java index c50045eec..0c4f387be 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Iterables; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java index 36de7adbe..6888d21f8 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java index 2d3b6f30a..0c3d5afe6 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.world.internal.WorldInfo; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java index b5619a905..627d12b67 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java index 12d132c96..f894882bd 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java index e4bb555f4..fcb40e8ba 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java index 43c274a89..be3704904 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java index b33ca3e2a..f1c7642a0 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java index 201582479..8eb63bb74 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java index 73cbf571b..a922e5f86 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java index 7e64f69c7..b46b310f3 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.entity; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java index 5ff66b9ff..287cb0cad 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import org.terasology.engine.network.NoReplicate; -/** - */ public abstract class AbstractConsumableEvent implements ConsumableEvent { @NoReplicate protected boolean consumed; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java index 202f70f00..df57fc0b7 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import org.terasology.engine.network.NoReplicate; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java index beefff42b..895bdba84 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import gnu.trove.iterator.TFloatIterator; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java index 05c0fb2ae..e15525230 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java index 43e7876ca..1d57ab88d 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java index b6d3e1bec..298152585 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java index 7bb9fe1ef..7ca73a7e6 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; -/** - */ public final class EventPriority { public static final int PRIORITY_CRITICAL = 200; public static final int PRIORITY_HIGH = 150; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java index 15e9e1a60..663af160a 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java index 2fcd1a2ae..ba80259c8 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java index c7a4c8d7d..1cca11746 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event.internal; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java index a395ff774..9aeaa6be5 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event.internal; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java index 560305a60..f921d0e2f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java @@ -17,7 +17,6 @@ import com.google.common.collect.Sets; import org.reflections.ReflectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; @@ -26,22 +25,9 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.entitySystem.event.EventPriority; import org.terasology.engine.entitySystem.event.PendingEvent; import org.terasology.engine.entitySystem.event.ReceiveEvent; -import org.terasology.engine.entitySystem.metadata.EventLibrary; -import org.terasology.engine.entitySystem.metadata.EventMetadata; import org.terasology.engine.entitySystem.systems.ComponentSystem; import org.terasology.engine.monitoring.PerformanceMonitor; -import org.terasology.engine.network.BroadcastEvent; -import org.terasology.engine.network.Client; -import org.terasology.engine.network.NetworkComponent; -import org.terasology.engine.network.NetworkEvent; -import org.terasology.engine.network.NetworkMode; -import org.terasology.engine.network.NetworkSystem; -import org.terasology.engine.network.OwnerEvent; -import org.terasology.engine.network.ServerEvent; -import org.terasology.engine.recording.EventCatcher; -import org.terasology.engine.recording.RecordAndReplayCurrentStatus; -import org.terasology.engine.recording.RecordAndReplayStatus; -import org.terasology.engine.world.block.BlockComponent; +import org.terasology.gestalt.assets.ResourceUrn; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java index 0d446cb52..f8aeba57d 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java index d65f0854d..94d8c56db 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; -import org.terasology.reflection.copy.CopyStrategyLibrary; -import org.terasology.engine.reflection.copy.strategy.EntityCopyStrategy; -import org.terasology.reflection.metadata.ClassMetadata; -import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.reflect.InaccessibleFieldException; -import org.terasology.reflection.reflect.ReflectFactory; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.Owns; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.reflection.copy.strategy.EntityCopyStrategy; import org.terasology.engine.utilities.ReflectionUtil; +import org.terasology.reflection.copy.CopyStrategy; +import org.terasology.reflection.copy.CopyStrategyLibrary; +import org.terasology.reflection.metadata.ClassMetadata; +import org.terasology.reflection.reflect.InaccessibleFieldException; +import org.terasology.reflection.reflect.ReflectFactory; import java.lang.reflect.Field; import java.lang.reflect.Type; @@ -34,7 +34,8 @@ public class ComponentFieldMetadata extends ReplicatedFi ownedReference = field.getAnnotation(Owns.class) != null && (EntityRef.class.isAssignableFrom(field.getType()) || isCollectionOf(EntityRef.class, field.getGenericType())); if (ownedReference) { - copyWithOwnedEntitiesStrategy = (CopyStrategy) copyStrategyLibrary.createCopyOfLibraryWithStrategy(EntityRef.class, EntityCopyStrategy.INSTANCE).getStrategy(field.getGenericType()); + copyWithOwnedEntitiesStrategy = + (CopyStrategy) copyStrategyLibrary.createCopyOfLibraryWithStrategy(EntityRef.class, EntityCopyStrategy.INSTANCE).getStrategy(field.getGenericType()); } else { copyWithOwnedEntitiesStrategy = copyStrategy; } @@ -53,8 +54,9 @@ public class ComponentFieldMetadata extends ReplicatedFi } /** - * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. - * Otherwise it behaves the same as getValue + * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field + * from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. Otherwise it + * behaves the same as getValue * * @param from The object to copy the field from * @return A safe to use copy of the value of this field in the given object @@ -65,9 +67,9 @@ public class ComponentFieldMetadata extends ReplicatedFi } /** - * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. - * Otherwise it behaves the same as getValue - * This method is checked to conform to the generic parameters of the FieldMetadata + * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field + * from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. Otherwise it + * behaves the same as getValue This method is checked to conform to the generic parameters of the FieldMetadata * * @param from The object to copy the field from * @return A safe to use copy of the value of this field in the given object diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java index 3f963269c..e8eaa601b 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.collect.Iterables; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java index 659908e9b..4f2ca4b53 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.base.Predicates; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java index c96b77df1..95dc4ccd8 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java index 412ebc571..0b8590589 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.base.Predicates; @@ -31,8 +18,6 @@ import org.terasology.engine.network.ServerEvent; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -/** - */ public class EventMetadata extends ClassMetadata> { private static final Logger logger = LoggerFactory.getLogger(EventMetadata.class); diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java index acf703f4b..cd1d46539 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java @@ -1,26 +1,11 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import org.terasology.engine.entitySystem.Component; import java.util.Locale; -/** - */ public final class MetadataUtil { private MetadataUtil() { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java index 119b16b50..d9ea67778 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; -/** - */ public enum NetworkEventType { /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java index db9c343f9..cc6112501 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import org.terasology.reflection.copy.CopyStrategyLibrary; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java index 2725aec73..b44505b9a 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 /** * This package contains metadata classes for the types important to the entity system - components and events. diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java index 831b29217..98d1a14a7 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java index e6d4f5d04..11c51fd82 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab; import org.terasology.gestalt.assets.Asset; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java index 87de49a48..a9e42f0dd 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab; import com.google.common.collect.Maps; @@ -24,8 +11,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -/** - */ public class PrefabData implements MutableComponentContainer, AssetData { private Map, Component> components = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java index b58c75cbe..91ae1d72f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java index a04a3f245..98b7f6f4e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab.internal; import com.google.common.collect.ImmutableList; @@ -28,8 +15,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -/** - */ public class PojoPrefab extends Prefab { private Prefab parent; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java index 2a17b65ef..d409c3467 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab.internal; import com.google.common.base.Strings; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java index bf6be109b..b18823c68 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java @@ -16,8 +16,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -/** - */ public class PrefabDeltaFormat extends AbstractAssetAlterationFileFormat { private final ComponentLibrary componentLibrary; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java index 0aeb74852..49b680cb7 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.prefab; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java index c166917a2..f9fa8df49 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.joml.Vector3i; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java index 45a4f678c..e78cb9935 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java index fafc086d6..ac550590e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java index 620eaf455..d14e5eff7 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.joml.Vector3i; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java index d542644dc..734d9ff75 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java index 0a49f090c..caf69c51f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java index 871c97103..d88acb1d4 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.core.Time; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java index b6ce3dc3c..8bc87fdb6 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java index cf670a43e..bf1e49d18 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java index a47ff7ab3..623643000 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; public interface ComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java index e84ffb9ff..e1a20a6fc 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java index a76c55fa4..8fcef4192 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java index 44aa5a7bc..3c3a2fac8 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java index ba3a967c6..a26713afc 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; import org.terasology.engine.logic.delay.DelayManager; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java index 5fde31d33..a206e14d5 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems.internal; import java.lang.annotation.ElementType; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java index 32962c9f8..f9ad9cdfd 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.systems; diff --git a/engine/src/main/java/org/terasology/engine/game/Game.java b/engine/src/main/java/org/terasology/engine/game/Game.java index 1a6c65d81..00e43927e 100644 --- a/engine/src/main/java/org/terasology/engine/game/Game.java +++ b/engine/src/main/java/org/terasology/engine/game/Game.java @@ -1,22 +1,7 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.game; -/** - */ public class Game { private String name = ""; diff --git a/engine/src/main/java/org/terasology/engine/game/GameManifest.java b/engine/src/main/java/org/terasology/engine/game/GameManifest.java index 6b928f926..111ca0d97 100644 --- a/engine/src/main/java/org/terasology/engine/game/GameManifest.java +++ b/engine/src/main/java/org/terasology/engine/game/GameManifest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.game; import com.google.common.collect.ImmutableList; @@ -41,8 +28,6 @@ import java.nio.file.Path; import java.util.List; import java.util.Map; -/** - */ public class GameManifest { public static final String DEFAULT_FILE_NAME = "manifest.json"; diff --git a/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java b/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java index 2a3804d85..a600b7523 100644 --- a/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java +++ b/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java b/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java index f1a30c906..2fe899f09 100644 --- a/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java +++ b/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import com.google.common.base.Charsets; diff --git a/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java b/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java index f3b602da5..dc95b041b 100644 --- a/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java +++ b/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java b/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java index 5f50f84fc..b481710a4 100644 --- a/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java +++ b/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.terasology.engine.config.SecurityConfig; diff --git a/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java b/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java index b22947127..1b72fac35 100644 --- a/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java +++ b/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java b/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java index 4fb50aede..19d423e14 100644 --- a/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java +++ b/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; diff --git a/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java b/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java index 7cf1a9135..13c0913eb 100644 --- a/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java +++ b/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; diff --git a/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java b/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java index 2f60c52e0..16f4a5da1 100644 --- a/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java +++ b/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.terasology.math.TeraMath; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java index 74e264758..a5b41b716 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java index 23ac6962d..789ce512d 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java index 0872039f2..844a63bf3 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.gson.JsonSerializer; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java index 0fbb11296..f6cb82999 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public enum HttpMethod { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java index 0170da077..c65e909b6 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java index 69a079313..880f12d87 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java index f67c3c5f0..2bcf31612 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public enum IdentityConflictSolution { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java index c2332768b..acd5c5083 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; -/** - */ final class InitializeFromTokenAction implements Action { @Override diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java index 8680df743..1e1fcb264 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java @@ -1,24 +1,9 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import java.net.URL; -/** - */ final class LoginAction implements Action { private final URL serviceURL; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java index a8bcac464..6e4b4bf12 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java @@ -1,22 +1,7 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; -/** - */ final class LogoutAction implements Action { private boolean deleteLocalIdentities; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java index 6f47b505a..2620e63db 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; @@ -20,8 +7,6 @@ import org.terasology.engine.identity.PublicIdentityCertificate; import java.util.Map; -/** - */ final class PutIdentityAction implements Action { private final Map identities; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java index e8d16a4e5..e2a3ed4ba 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java index 0c330c36e..88272c21e 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.i18n.TranslationSystem; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java index 757595750..6054c5d23 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public class StorageServiceException extends Exception { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java index 1be1a1de9..42332fe82 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.common.collect.ImmutableMap; @@ -36,9 +23,9 @@ import java.util.Map; import java.util.concurrent.LinkedBlockingDeque; /** - * The public interface to this package. Manages a communication session with the storage service server, - * can answer for status information queries and can perform asynchronous operations on the storage service. - * This class can be in two states, with the default being "logged out". + * The public interface to this package. Manages a communication session with the storage service server, can answer for + * status information queries and can perform asynchronous operations on the storage service. This class can be in two + * states, with the default being "logged out". */ public final class StorageServiceWorker { @@ -94,7 +81,8 @@ public final class StorageServiceWorker { public void flushNotificationsToConsole(Console target) { while (!notificationBuffer.isEmpty()) { ConsoleNotification notification = notificationBuffer.pop(); - String message = translationSystem.translate("${engine:menu#storage-service}") + ": " + String.format(translationSystem.translate(notification.messageId), notification.args); + String message = + translationSystem.translate("${engine:menu#storage-service}") + ": " + String.format(translationSystem.translate(notification.messageId), notification.args); target.addMessage(message, CoreMessageType.NOTIFICATION); } } @@ -108,16 +96,16 @@ public final class StorageServiceWorker { } /** - * Tries to initialize the session using the parameters (host URL and session token) read from configuration. - * The session token is verified against the server; if it's valid, the status is switched to logged in. + * Tries to initialize the session using the parameters (host URL and session token) read from configuration. The + * session token is verified against the server; if it's valid, the status is switched to logged in. */ public void initializeFromConfig() { performAction(new InitializeFromTokenAction(), StorageServiceWorkerStatus.LOGGED_OUT); } /** - * Tries to login with the specified credentials; on success, the status is switched to logged in - * and the parameters are stored in configuration. + * Tries to login with the specified credentials; on success, the status is switched to logged in and the parameters + * are stored in configuration. */ public void login(URL serviceURL, String login, String password) { performAction(new LoginAction(serviceURL, login, password), StorageServiceWorkerStatus.LOGGED_OUT); @@ -125,6 +113,7 @@ public final class StorageServiceWorker { /** * Destroys the current session and switches to the logged out status. + * * @param deleteLocalIdentities whether the locally stored identities should be deleted or not. */ public void logout(boolean deleteLocalIdentities) { @@ -161,19 +150,21 @@ public final class StorageServiceWorker { */ public IdentityConflict getNextConflict() { IdentityBundle entry = conflictingRemoteIdentities.peekFirst(); - return new IdentityConflict(entry.getServer(), securityConfig.getIdentity(entry.getServer()), entry.getClient()); + return new IdentityConflict(entry.getServer(), securityConfig.getIdentity(entry.getServer()), + entry.getClient()); } /** - * @param solution the strategy to resolve the conflict returned by the latest call to {@link #getNextConflict()}. - * If there are no more conflicts and some of the solved conflicts must keep the local version, the uploads are performed asynchronously. + * @param solution the strategy to resolve the conflict returned by the latest call to {@link + * #getNextConflict()}. If there are no more conflicts and some of the solved conflicts must keep the local + * version, the uploads are performed asynchronously. */ public void solveNextConflict(IdentityConflictSolution solution) { IdentityBundle entry = conflictingRemoteIdentities.removeFirst(); PublicIdentityCertificate server = entry.getServer(); ClientIdentity remote = entry.getClient(); ClientIdentity local = securityConfig.getIdentity(server); - switch(solution) { + switch (solution) { case KEEP_LOCAL: //save for upload (remote will be overwritten) conflictSolutionsToUpload.put(server, local); break; @@ -193,6 +184,7 @@ public final class StorageServiceWorker { private static final class ConsoleNotification { private String messageId; private Object[] args; + private ConsoleNotification(String messageId, Object[] args) { this.messageId = messageId; this.args = args; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java index 96eaf37bf..664144352 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public enum StorageServiceWorkerStatus { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java index dfc5d42c9..e7628f9eb 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.common.collect.MapDifference; @@ -22,8 +9,6 @@ import org.terasology.engine.identity.PublicIdentityCertificate; import java.util.Map; -/** - */ final class SyncIdentitiesAction implements Action { @Override diff --git a/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java b/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java index ad8b5002b..64a15f7cc 100644 --- a/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java @@ -5,8 +5,6 @@ package org.terasology.engine.input; import org.terasology.engine.input.events.AxisEvent; -/** - */ public class BindAxisEvent extends AxisEvent { private String id; diff --git a/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java b/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java index fa424cf96..91ccde6b5 100644 --- a/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java @@ -7,8 +7,6 @@ import org.terasology.engine.core.SimpleUri; import org.terasology.engine.input.events.ButtonEvent; import org.terasology.input.ButtonState; -/** - */ public class BindButtonEvent extends ButtonEvent { private SimpleUri id; diff --git a/engine/src/main/java/org/terasology/engine/input/BindableButton.java b/engine/src/main/java/org/terasology/engine/input/BindableButton.java index 27ad321fa..2c719c7d8 100644 --- a/engine/src/main/java/org/terasology/engine/input/BindableButton.java +++ b/engine/src/main/java/org/terasology/engine/input/BindableButton.java @@ -11,8 +11,6 @@ import org.terasology.input.ActivateMode; import org.terasology.input.ButtonState; import org.terasology.input.Input; -/** - */ public interface BindableButton { /** diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java b/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java index 864f58de6..bbf4c5b64 100644 --- a/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java @@ -8,8 +8,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterBindAxis { diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java b/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java index 4b40efb00..f800bc4b4 100644 --- a/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java +++ b/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java @@ -10,8 +10,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterBindButton { diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java b/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java index 217ae68c4..ca2831648 100644 --- a/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java @@ -8,8 +8,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterRealBindAxis { diff --git a/engine/src/main/java/org/terasology/engine/input/SendEventMode.java b/engine/src/main/java/org/terasology/engine/input/SendEventMode.java index d6a6e1ae0..22af1a804 100644 --- a/engine/src/main/java/org/terasology/engine/input/SendEventMode.java +++ b/engine/src/main/java/org/terasology/engine/input/SendEventMode.java @@ -3,8 +3,6 @@ package org.terasology.engine.input; -/** - */ public enum SendEventMode { /** * Send an event every update/frame with the current axis value diff --git a/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java b/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java index 2f11bfc65..b4fc40182 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "console", description = "${engine:menu#binding-console}", category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.GRAVE) @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.F1) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java b/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java index c86cf5bc1..a23b2afa0 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java @@ -8,8 +8,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "hideHUD", description = "${engine:menu#binding-hide-hud}", category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.H) public class HideHUDButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java b/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java index b43356cae..3bf978d77 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterBindButton(id = "attack", description = "${engine:menu#binding-attack}", repeating = true) @DefaultBinding(type = InputType.MOUSE_BUTTON, id = 0) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.ZERO) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java b/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java index de435b7e7..e522e4e60 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java @@ -10,8 +10,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "frob", description = "${engine:menu#binding-frob}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.E) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.FOUR) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java b/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java index 99d734896..4929f90fb 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java @@ -10,8 +10,6 @@ import org.terasology.gestalt.module.sandbox.API; import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterBindButton(id = "useItem", description = "${engine:menu#binding-use-item}", repeating = true, category = "interaction") @DefaultBinding(type = InputType.MOUSE_BUTTON, id = 1) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.THREE) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java index ccc99dab4..64ef8d5be 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "backwards", description = "${engine:menu#binding-backwards}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.S) public class BackwardsButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java index 9f2b6fee2..61e81e21e 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "crouch", description = "${engine:menu#binding-crouch}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.LEFT_CTRL) public class CrouchButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java index 692646e14..a314eba13 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java @@ -8,8 +8,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "crouchMode", description = "${engine:menu#binding-crouch-mode}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.X) public class CrouchModeButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java index 1ee50519b..5ba2ead4e 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "forwards", description = "${engine:menu#binding-forwards}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.W) public class ForwardsButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java index a46757025..7c8e652ff 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.BindAxisEvent; import org.terasology.engine.input.RegisterBindAxis; import org.terasology.engine.input.SendEventMode; -/** - */ @RegisterBindAxis(id = "forwardsMovement", positiveButton = "engine:forwards", negativeButton = "engine:backwards", eventMode = SendEventMode.WHEN_CHANGED) public class ForwardsMovementAxis extends BindAxisEvent { } diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java index d37874b69..de69cc978 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java @@ -10,8 +10,6 @@ import org.terasology.engine.input.SendEventMode; import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterRealBindAxis(id = "forwardsRealMovement", eventMode = SendEventMode.WHEN_CHANGED) @DefaultBinding(type = InputType.CONTROLLER_AXIS, id = ControllerId.Y_AXIS) public class ForwardsRealMovementAxis extends BindAxisEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java index a10c66641..d84cf09fd 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java @@ -10,8 +10,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "jump", description = "${engine:menu#binding-jump}", repeating = true) @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.SPACE) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.TWO) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java index a7d64705c..c88adfd78 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "left", description = "${engine:menu#binding-left}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.A) public class LeftStrafeButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java index 8d05c6f30..8b2046162 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "right", description = "${engine:menu#binding-right}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.D) public class RightStrafeButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java index af649fee1..09c90760f 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.BindAxisEvent; import org.terasology.engine.input.RegisterBindAxis; import org.terasology.engine.input.SendEventMode; -/** - */ @RegisterBindAxis(id = "strafe", positiveButton = "engine:left", negativeButton = "engine:right", eventMode = SendEventMode.WHEN_CHANGED) public class StrafeMovementAxis extends BindAxisEvent { } diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java index 258715aa8..ccfcd1617 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java @@ -10,8 +10,6 @@ import org.terasology.engine.input.SendEventMode; import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterRealBindAxis(id = "strafeRealMovement", eventMode = SendEventMode.WHEN_CHANGED) @DefaultBinding(type = InputType.CONTROLLER_AXIS, id = ControllerId.X_AXIS) public class StrafeRealMovementAxis extends BindAxisEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java index 256125818..633414f55 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "toggleSpeedPermanently", description = "${engine:menu#binding-toggle-speed-permanently}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.CAPS_LOCK) public class ToggleSpeedPermanentlyButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java index d6636419d..d47bfd2d7 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java @@ -9,8 +9,6 @@ import org.terasology.engine.input.RegisterBindButton; import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "toggleSpeedTemporarily", description = "${engine:menu#binding-toggle-speed-temporarily}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.LEFT_SHIFT) public class ToggleSpeedTemporarilyButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java index c17d1f30d..54c89586e 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.BindAxisEvent; import org.terasology.engine.input.RegisterBindAxis; import org.terasology.engine.input.SendEventMode; -/** - */ @RegisterBindAxis(id = "verticalMovement", positiveButton = "engine:jump", negativeButton = "engine:crouch", eventMode = SendEventMode.WHEN_CHANGED) public class VerticalMovementAxis extends BindAxisEvent { } diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java index 1d456a762..931feef8d 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java @@ -10,8 +10,6 @@ import org.terasology.engine.input.SendEventMode; import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterRealBindAxis(id = "verticalRealMovement", eventMode = SendEventMode.WHEN_CHANGED) @DefaultBinding(type = InputType.CONTROLLER_AXIS, id = ControllerId.Z_AXIS) public class VerticalRealMovementAxis extends BindAxisEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java index 7401b7c3b..7b39d9c3b 100644 --- a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java @@ -6,8 +6,6 @@ package org.terasology.engine.input.cameraTarget; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class CameraTargetChangedEvent implements Event { private EntityRef oldTarget; private EntityRef newTarget; diff --git a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java index 627ac56ba..c9a9aa1d3 100644 --- a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java +++ b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java @@ -23,8 +23,6 @@ import org.terasology.math.TeraMath; import java.util.Arrays; -/** - */ public class CameraTargetSystem extends BaseComponentSystem { @In diff --git a/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java b/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java index 3caa8c461..a05063aa4 100644 --- a/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.input.events; -/** - */ public abstract class AxisEvent extends InputEvent { public AxisEvent(float delta) { diff --git a/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java b/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java index 137f611b8..f634c99ee 100644 --- a/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java @@ -5,8 +5,6 @@ package org.terasology.engine.input.events; import org.terasology.input.ButtonState; -/** - */ public abstract class ButtonEvent extends InputEvent { public ButtonEvent(float delta) { diff --git a/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java b/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java index ef3665f0e..5038da532 100644 --- a/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java @@ -6,8 +6,6 @@ package org.terasology.engine.input.events; import org.joml.Vector2i; -/** - */ public class MouseWheelEvent extends InputEvent { private int wheelTurns; diff --git a/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java b/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java index 9c1036d7c..bcdef3758 100644 --- a/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java +++ b/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -/** - */ @RegisterSystem public class BindCommands extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java b/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java index 7f3c331ae..cef294658 100644 --- a/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java +++ b/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java @@ -3,8 +3,6 @@ package org.terasology.engine.logic.actions; -/** - */ public enum ActionTarget { Instigator, Target, diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java index cd3f95811..ec089ef7c 100644 --- a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java +++ b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java @@ -13,8 +13,6 @@ import org.terasology.engine.entitySystem.systems.RegisterSystem; import org.terasology.engine.logic.common.ActivateEvent; import org.terasology.engine.registry.In; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class SpawnPrefabAction extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java index 0db63be15..98103cac1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.actions; import org.terasology.engine.entitySystem.Component; -/** - */ public class SpawnPrefabActionComponent implements Component { public String prefab; public ActionTarget spawnLocationRelativeTo = ActionTarget.Target; diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java b/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java index 886318dbe..66c2f7a12 100644 --- a/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.ai; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; -/** - */ public final class HierarchicalAIComponent implements Component { //how often updates are progressed, handle whit care diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java index 8ece04e18..3bd81b163 100644 --- a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.ai; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; -/** - */ public final class SimpleAIComponent implements Component { public long lastChangeOfDirectionAt; diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java index e2865520f..01cfe3aa9 100644 --- a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java @@ -22,8 +22,6 @@ import org.terasology.engine.utilities.random.FastRandom; import org.terasology.engine.utilities.random.Random; import org.terasology.engine.world.WorldProvider; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class SimpleAISystem extends BaseComponentSystem implements UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java b/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java index 407b1e636..288082d44 100644 --- a/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java @@ -15,8 +15,6 @@ import org.terasology.engine.registry.In; import java.util.Set; -/** - */ @RegisterSystem public class AutoCreateSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java index 160c47d36..cec41174d 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java @@ -11,7 +11,7 @@ import org.terasology.gestalt.module.sandbox.API; * */ @API -public class CollectiveBehaviorComponent implements Component{ +public class CollectiveBehaviorComponent implements Component { public BehaviorTree tree; public transient CollectiveInterpreter collectiveInterpreter; } diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java index e72d6e146..05a25650e 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java @@ -28,7 +28,7 @@ public class SleepAction extends BaseAction { public BehaviorState modify(Actor actor, BehaviorState result) { float timeRemaining = 0; - try {// TODO figure out the delegation issue + try { // TODO figure out the delegation issue timeRemaining = actor.getValue(getId()); } catch (NullPointerException e) { construct(actor); diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java index 8ecf960f8..fade4275f 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.behavior.asset; import org.terasology.gestalt.assets.AssetData; import org.terasology.engine.logic.behavior.core.BehaviorNode; -/** - */ public class BehaviorTreeData implements AssetData { private BehaviorNode root; diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java index 5746b8d2e..c8a88b096 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java @@ -8,8 +8,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; import org.terasology.engine.input.RegisterBindButton; -/** - */ @RegisterBindButton(id = "behavior_editor", description = "${engine:menu#binding-behavior-editor}", category = "behavior") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.F5) public class BTEditorButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java index 8c0337593..427ae5e3b 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java @@ -35,8 +35,6 @@ import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.util.List; -/** - */ public class BehaviorEditorScreen extends CoreScreenLayer { public static final Logger logger = LoggerFactory.getLogger(BehaviorEditorScreen.class); public static final String PALETTE_ITEM_OPEN = "--"; diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java index e29b5c726..78f105623 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java @@ -10,8 +10,6 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -/** - */ public class PortList implements TreeAccessor { private List ports = Lists.newLinkedList(); private Port.InputPort inputPort; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java index 0b8ed01cb..03433649e 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java @@ -8,8 +8,6 @@ import org.joml.Vector3fc; import org.terasology.engine.network.NetworkEvent; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent public class CharacterMoveInputEvent extends NetworkEvent { private long delta; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java index 16b72e463..543c6e971 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java @@ -9,8 +9,6 @@ import org.terasology.engine.entitySystem.Component; import java.util.List; -/** - */ public final class CharacterSoundComponent implements Component { public List footstepSounds = Lists.newArrayList(); diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java index b3b64f294..68ce0a956 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java @@ -32,8 +32,6 @@ import org.terasology.engine.world.block.Block; import java.util.List; -/** - */ @RegisterSystem(RegisterMode.ALWAYS) public class CharacterSoundSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java index 396c1e205..5cc5cc7ed 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java @@ -53,9 +53,7 @@ import org.terasology.engine.world.block.regions.ActAsBlockComponent; import java.util.Optional; -/** - * - */ + @RegisterSystem public class CharacterSystem extends BaseComponentSystem implements UpdateSubscriberSystem { public static final CollisionGroup[] DEFAULTPHYSICSFILTER = {StandardCollisionGroup.DEFAULT, StandardCollisionGroup.WORLD, StandardCollisionGroup.CHARACTER}; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java index 083d1f6a2..1f9c27bc0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java @@ -30,8 +30,6 @@ import java.util.Deque; import java.util.Iterator; import java.util.Map; -/** - */ @RegisterSystem(RegisterMode.REMOTE_CLIENT) public class ClientCharacterPredictionSystem extends BaseComponentSystem implements UpdateSubscriberSystem { private static final Logger logger = LoggerFactory.getLogger(ClientCharacterPredictionSystem.class); @@ -127,7 +125,9 @@ public class ClientCharacterPredictionSystem extends BaseComponentSystem impleme private CharacterStateEvent createInitialState(EntityRef entity) { LocationComponent location = entity.getComponent(LocationComponent.class); - return new CharacterStateEvent(time.getGameTimeInMs(), 0, location.getWorldPosition(new org.joml.Vector3f()), location.getWorldRotation(new Quaternionf()), new Vector3f(), 0, 0, MovementMode.WALKING, false); + return new CharacterStateEvent(time.getGameTimeInMs(), 0, + location.getWorldPosition(new Vector3f()), location.getWorldRotation(new Quaternionf()), + new Vector3f(), 0, 0, MovementMode.WALKING, false); } private CharacterStateEvent stepState(CharacterMoveInputEvent input, CharacterStateEvent lastState, EntityRef entity) { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java b/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java index ba4e3c694..a60a44ff8 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java @@ -3,8 +3,6 @@ package org.terasology.engine.logic.characters; -/** - */ public enum MovementMode { WALKING(1f, 8f, true, true, true, 3f, false), CROUCHING(1f, 8f, true, true, true, 1.5f, false), diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java index b659a1302..e54c13a09 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java @@ -4,7 +4,6 @@ package org.terasology.engine.logic.characters; import org.joml.Quaternionf; import org.joml.Vector3f; -import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.engine.core.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent; import org.terasology.engine.entitySystem.entity.EntityBuilder; import org.terasology.engine.entitySystem.entity.EntityManager; @@ -22,6 +21,7 @@ import org.terasology.engine.logic.location.Location; import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.logic.players.LocalPlayer; import org.terasology.engine.registry.In; +import org.terasology.gestalt.assets.management.AssetManager; /** * This system is responsible for sending a {@link CreateVisualCharacterEvent} according to how it is specified in @@ -63,7 +63,8 @@ public class VisualCharacterSystem extends BaseComponentSystem { visualCharacterComponent.visualCharacter.destroy(); } - void createVisualCharacterIfNotOwnCharacter(EntityRef characterEntity, VisualCharacterComponent visualCharacterComponent) { + void createVisualCharacterIfNotOwnCharacter(EntityRef characterEntity, + VisualCharacterComponent visualCharacterComponent) { boolean isCharacterOfLocalPlayer = characterEntity.getOwner().equals(localPlayer.getClientEntity()); if (isCharacterOfLocalPlayer) { return; @@ -72,7 +73,7 @@ public class VisualCharacterSystem extends BaseComponentSystem { characterEntity.send(event); EntityBuilder entityBuilder = event.getVisualCharacterBuilder(); EntityRef visualCharacterEntity = createAndAttachVisualEntityStrategy.createAndAttachVisualEntity(entityBuilder, - characterEntity); + characterEntity); visualCharacterComponent.visualCharacter = visualCharacterEntity; characterEntity.saveComponent(visualCharacterComponent); diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java index 9ec0d3ae9..781d9f26c 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java @@ -7,8 +7,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; import org.terasology.engine.logic.location.LocationComponent; -/** - */ public class ActivationPredicted extends AbstractConsumableEvent { private EntityRef instigator; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java index 4e8b9eb18..19b554f13 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java @@ -8,8 +8,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.NetworkEvent; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent(lagCompensate = true) public class ActivationRequest extends NetworkEvent { /** diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java index 8c6c37af7..394a986d1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java @@ -7,8 +7,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.NetworkEvent; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent(lagCompensate = true) public class AttackRequest extends NetworkEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java index 0d50306f2..6d7d6f24e 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.characters.events; import org.joml.Vector3f; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class CollisionEvent implements Event { private Vector3f velocity; private Vector3f location; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java index 377df20b8..8e8836ba1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.logic.characters.events; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class FootstepEvent implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java index e06b25d17..aac8642f2 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.logic.characters.events; import org.joml.Vector3f; -/** - */ public class HorizontalCollisionEvent extends CollisionEvent { public HorizontalCollisionEvent(Vector3f location, Vector3f velocity) { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java index e10354352..f594b3244 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java @@ -4,7 +4,5 @@ package org.terasology.engine.logic.characters.events; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class JumpEvent implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java index c86fb1168..b4b1265ec 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.characters.events; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.logic.characters.MovementMode; -/** - */ public class SetMovementModeEvent implements Event { private MovementMode mode; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java index 0e367149e..c8a67d071 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.logic.characters.events; import org.joml.Vector3f; -/** - */ public class VerticalCollisionEvent extends CollisionEvent { public VerticalCollisionEvent(Vector3f location, Vector3f velocity) { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java index 0f748cc18..bb996f804 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java @@ -19,8 +19,6 @@ import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.ScreenLayerClosedEvent; -/** - */ @RegisterSystem(RegisterMode.ALWAYS) public class InteractionSystem extends BaseComponentSystem { private static final Logger logger = LoggerFactory.getLogger(InteractionSystem.class); diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java index 44b14e402..70b8d64e9 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java @@ -4,7 +4,5 @@ package org.terasology.engine.logic.characters.interactions; import org.terasology.engine.entitySystem.Component; -/** - */ public class InteractionTargetComponent implements Component { } diff --git a/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java b/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java index 607a31203..73d1b4aa5 100644 --- a/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java @@ -33,8 +33,6 @@ import java.util.Arrays; import static java.util.stream.Collectors.joining; -/** - */ @RegisterSystem public class ChatSystem extends BaseComponentSystem { private static final Logger logger = LoggerFactory.getLogger(ChatSystem.class); diff --git a/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java b/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java index e5e56c439..d68310b72 100644 --- a/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java @@ -8,8 +8,6 @@ import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; import org.terasology.engine.logic.characters.events.ActivationRequest; import org.terasology.engine.logic.location.LocationComponent; -/** - */ // TODO: This should not be consumable. Instead have a consumable BeforeActivate event to allow cancellation public class ActivateEvent extends AbstractConsumableEvent { private EntityRef instigator; diff --git a/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java b/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java index 90d790e80..af2ac9e9d 100644 --- a/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java @@ -7,8 +7,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.items.AddToBlockBasedItem; -/** - */ @AddToBlockBasedItem public class DisplayNameComponent implements Component { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java b/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java index c3084f692..0ab4f61d5 100644 --- a/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java @@ -14,8 +14,6 @@ import org.terasology.engine.entitySystem.systems.RegisterSystem; import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.registry.In; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class LifespanSystem extends BaseComponentSystem implements UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/Console.java b/engine/src/main/java/org/terasology/engine/logic/console/Console.java index ed908ef0d..207cc1412 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/Console.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/Console.java @@ -9,8 +9,6 @@ import org.terasology.gestalt.naming.Name; import java.util.Collection; import java.util.List; -/** - */ public interface Console { String NEW_LINE = "\n"; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java b/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java index 2e72e54e7..4597eb31f 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.console; import org.terasology.nui.Color; -/** - */ public enum CoreMessageType implements MessageType { CONSOLE(ConsoleColors.DEFAULT), CHAT(ConsoleColors.CHAT), diff --git a/engine/src/main/java/org/terasology/engine/logic/console/Message.java b/engine/src/main/java/org/terasology/engine/logic/console/Message.java index 13cfa02a9..9d5164ae0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/Message.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/Message.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console; -/** - */ public class Message { private final MessageType type; @@ -42,8 +40,7 @@ public class Message { return type; } - public boolean hasNewLine() - { + public boolean hasNewLine() { return newLine; } diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java index 3ce9d4366..700b86ed1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java @@ -17,8 +17,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -/** - */ public final class CommandParameter implements Parameter { private final String name; private final Class type; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java index 7c7cec166..15bdef6bb 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import java.util.Optional; -/** - */ public enum MarkerParameters implements Parameter { /** * Marks a parameter which is invalid - there is no information on how it should be provided. diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java index 3a22ecb9e..235a8f4f1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java @@ -10,13 +10,13 @@ import org.reflections.ReflectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.engine.context.Context; +import org.terasology.engine.logic.console.Console; import org.terasology.engine.logic.console.commandSystem.annotations.Command; import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam; import org.terasology.engine.logic.console.commandSystem.annotations.Sender; -import org.terasology.engine.logic.console.Console; -import org.terasology.gestalt.naming.Name; import org.terasology.engine.registry.InjectionHelper; import org.terasology.engine.utilities.reflection.SpecificAccessibleObject; +import org.terasology.gestalt.naming.Name; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -24,20 +24,18 @@ import java.lang.reflect.Modifier; import java.util.List; import java.util.Set; -/** - */ public final class MethodCommand extends AbstractCommand { private static final Logger logger = LoggerFactory.getLogger(MethodCommand.class); private static final String ENTITY_REF_NAME = "org.terasology.engine.entitySystem.entity.EntityRef"; - private MethodCommand(Name name, String requiredPermission, boolean runOnServer, String description, String helpText, + private MethodCommand(Name name, String requiredPermission, boolean runOnServer, String description, + String helpText, SpecificAccessibleObject executionMethod, Context context) { super(name, requiredPermission, runOnServer, description, helpText, executionMethod, context); } /** - * Creates a new {@code ReferencedCommand} to a specific method - * annotated with {@link Command}. + * Creates a new {@code ReferencedCommand} to a specific method annotated with {@link Command}. * * @param specificMethod The method to reference to * @return The command reference object created @@ -71,20 +69,25 @@ public final class MethodCommand extends AbstractCommand { * Registers all available command methods annotated with {@link Command}. */ public static void registerAvailable(Object provider, Console console, Context context) { - Predicate predicate = Predicates.and(ReflectionUtils.withModifier(Modifier.PUBLIC), ReflectionUtils.withAnnotation(Command.class)); + Predicate predicate = Predicates.and(ReflectionUtils.withModifier(Modifier.PUBLIC), + ReflectionUtils.withAnnotation(Command.class)); Set commandMethods = ReflectionUtils.getAllMethods(provider.getClass(), predicate); for (Method method : commandMethods) { if (!hasSenderAnnotation(method)) { - logger.error("Command {} provided by {} contains a EntityRef without @Sender annotation, may cause a NullPointerException", method.getName(), provider.getClass().getSimpleName()); + logger.error("Command {} provided by {} contains a EntityRef without @Sender annotation, may cause a " + + "NullPointerException", method.getName(), provider.getClass().getSimpleName()); } - logger.debug("Registering command method {} in class {}", method.getName(), method.getDeclaringClass().getCanonicalName()); + logger.debug("Registering command method {} in class {}", method.getName(), + method.getDeclaringClass().getCanonicalName()); try { SpecificAccessibleObject specificMethod = new SpecificAccessibleObject<>(method, provider); MethodCommand command = referringTo(specificMethod, context); console.registerCommand(command); - logger.debug("Registered command method {} in class {}", method.getName(), method.getDeclaringClass().getCanonicalName()); + logger.debug("Registered command method {} in class {}", method.getName(), + method.getDeclaringClass().getCanonicalName()); } catch (RuntimeException t) { - logger.error("Failed to load command method {} in class {}", method.getName(), method.getDeclaringClass().getCanonicalName(), t); + logger.error("Failed to load command method {} in class {}", method.getName(), + method.getDeclaringClass().getCanonicalName(), t); } } } @@ -97,7 +100,7 @@ public final class MethodCommand extends AbstractCommand { if (paramAnnotations[i].length == 0) { return false; } else { - for (Annotation annotation: paramAnnotations[i]) { + for (Annotation annotation : paramAnnotations[i]) { if (annotation instanceof Sender) { return true; } @@ -133,7 +136,7 @@ public final class MethodCommand extends AbstractCommand { String name = parameterAnnotation.value(); Class suggesterClass = parameterAnnotation.suggester(); boolean required = parameterAnnotation.required(); - CommandParameterSuggester suggester = InjectionHelper.createWithConstructorInjection(suggesterClass, + CommandParameterSuggester suggester = InjectionHelper.createWithConstructorInjection(suggesterClass, context); if (type.isArray()) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java index df8426fb0..9214cdac8 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java @@ -7,8 +7,6 @@ import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.block.family.BlockFamily; -/** - */ public class BlockFamilyAdapter implements ParameterAdapter { @Override public BlockFamily parse(String raw) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java index ef5d6dd7c..21e5ae0ea 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java @@ -4,8 +4,6 @@ package org.terasology.engine.logic.console.commandSystem.adapter; import org.terasology.gestalt.naming.Name; -/** - */ public class NameAdapter implements ParameterAdapter { @Override public Name parse(String raw) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java index 6bd383e5a..a01919f32 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java @@ -11,8 +11,6 @@ import org.terasology.engine.world.block.family.BlockFamily; import java.util.Map; -/** - */ @API public class ParameterAdapterManager { private final Map, ParameterAdapter> adapters = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java index f0d1d34b8..e30a706d9 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.console.commandSystem.adapter; import org.terasology.engine.utilities.Assets; import org.terasology.engine.entitySystem.prefab.Prefab; -/** - */ public class PrefabAdapter implements ParameterAdapter { @Override public Prefab parse(String raw) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java index b147894cc..86ee7a9d9 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.console.commandSystem.adapter; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -/** - */ public final class PrimitiveAdapters { public static final ParameterAdapter LONG = new ParameterAdapter() { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java index df2ef70ee..62a1e6af5 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.commandSystem.exceptions; -/** - */ public class CommandExecutionException extends Exception { private static final long serialVersionUID = 5104187084941740072L; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java index d3f51bb02..d43ff45fc 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.commandSystem.exceptions; -/** - */ public class CommandInitializationException extends IllegalArgumentException { private static final long serialVersionUID = 5345663512766407880L; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java index afee185d5..c4079a2f0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.commandSystem.exceptions; -/** - */ public class CommandParameterParseException extends Exception { private static final long serialVersionUID = 4519046979318192019L; private final String parameter; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java b/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java index 658f80395..f80cbcdc1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java @@ -12,8 +12,6 @@ import org.terasology.gestalt.naming.Name; import java.util.Collection; import java.util.Set; -/** - */ public final class CommandNameSuggester implements CommandParameterSuggester { private final Console console; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java b/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java index 2dea13091..9cf5f6529 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.ui; -/** - */ public interface TabCompletionEngine { /** diff --git a/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java b/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java index 62d4ec014..6a5a8977a 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java @@ -11,8 +11,6 @@ import org.terasology.nui.widgets.UIText; import java.util.List; -/** - */ public class UICommandEntry extends UIText { private Binding> commandHistory = new DefaultBinding<>(Lists.newArrayList()); diff --git a/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java b/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java index 404d43563..64b4250f0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java +++ b/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java @@ -16,8 +16,6 @@ import org.terasology.engine.world.chunks.event.OnChunkLoaded; import java.util.Set; -/** - */ @RegisterSystem public class ChunkEventErrorLogger extends BaseComponentSystem { private static final Logger logger = LoggerFactory.getLogger(ChunkEventErrorLogger.class); diff --git a/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java b/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java index 8eee7a8d7..4112e3b45 100644 --- a/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.logic.delay; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class DelayedActionTriggeredEvent implements Event { private String actionId; diff --git a/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java b/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java index 13ed31c54..261efc26b 100644 --- a/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.logic.delay; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class PeriodicActionTriggeredEvent implements Event { private String actionId; diff --git a/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java b/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java index 581c4bb49..7f0854ee6 100644 --- a/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; import org.terasology.engine.entitySystem.prefab.Prefab; -/** - */ public class BeforeDestroyEvent extends AbstractConsumableEvent { private EntityRef instigator; private EntityRef directCause; diff --git a/engine/src/main/java/org/terasology/engine/logic/location/Location.java b/engine/src/main/java/org/terasology/engine/logic/location/Location.java index ffc8c2b4f..9513616ac 100644 --- a/engine/src/main/java/org/terasology/engine/logic/location/Location.java +++ b/engine/src/main/java/org/terasology/engine/logic/location/Location.java @@ -15,8 +15,6 @@ import org.terasology.engine.entitySystem.systems.RegisterSystem; import java.util.Iterator; -/** - */ @RegisterSystem public class Location extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java index 7a9846f40..814ca75da 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java @@ -10,18 +10,18 @@ import org.terasology.engine.entitySystem.event.ReceiveEvent; import org.terasology.engine.entitySystem.systems.BaseComponentSystem; import org.terasology.engine.entitySystem.systems.RegisterMode; import org.terasology.engine.entitySystem.systems.RegisterSystem; -import org.terasology.engine.logic.characters.CharacterComponent; -import org.terasology.engine.logic.players.event.WorldtimeResetEvent; -import org.terasology.input.Keyboard; import org.terasology.engine.input.binds.general.HideHUDButton; import org.terasology.engine.input.events.KeyDownEvent; import org.terasology.engine.input.events.KeyEvent; import org.terasology.engine.input.events.MouseAxisEvent; +import org.terasology.engine.logic.characters.CharacterComponent; +import org.terasology.engine.logic.players.event.WorldtimeResetEvent; import org.terasology.engine.network.ClientComponent; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.layers.ingame.metrics.DebugOverlay; import org.terasology.engine.world.WorldProvider; +import org.terasology.input.Keyboard; @RegisterSystem(RegisterMode.CLIENT) @@ -50,7 +50,8 @@ public class DebugControlSystem extends BaseComponentSystem { public void onHideHUD(HideHUDButton event, EntityRef entity) { if (event.isDown()) { // Make sure both are either visible or hidden - final boolean hide = !(config.getRendering().getDebug().isHudHidden() && config.getRendering().getDebug().isFirstPersonElementsHidden()); + final boolean hide = + !(config.getRendering().getDebug().isHudHidden() && config.getRendering().getDebug().isFirstPersonElementsHidden()); config.getRendering().getDebug().setFirstPersonElementsHidden(hide); config.getRendering().getDebug().setHudHidden(hide); @@ -61,9 +62,9 @@ public class DebugControlSystem extends BaseComponentSystem { /** - * Creates illusion of time flying by if corresponding key is held down. - * Up / Down : Increases / Decreases time of day by 0.005 per keystroke. - * Right / left : Increases / Decreases time of day by 0.02 per keystroke. + * Creates illusion of time flying by if corresponding key is held down. Up / Down : Increases / Decreases time of + * day by 0.005 per keystroke. Right / left : Increases / Decreases time of day by 0.02 per keystroke. + * * @param entity The player entity that triggered the time change. */ @ReceiveEvent(components = ClientComponent.class) @@ -79,7 +80,7 @@ public class DebugControlSystem extends BaseComponentSystem { timeTravel(entity, event, -0.005f); break; case Keyboard.KeyId.RIGHT: - timeTravel(entity, event, 0.02f); + timeTravel(entity, event, 0.02f); break; case Keyboard.KeyId.LEFT: timeTravel(entity, event, -0.02f); @@ -140,15 +141,15 @@ public class DebugControlSystem extends BaseComponentSystem { } /** - * Ensures every player on the server has their time updated when - * a KeyEvent is triggered in Debug mode. + * Ensures every player on the server has their time updated when a KeyEvent is triggered in Debug mode. + * * @param entity The player entity that triggered the time change. * @param event The KeyEvent which triggered the time change. * @param timeDiff The time (in days) to add/retrieve. */ private void timeTravel(EntityRef entity, KeyEvent event, float timeDiff) { - float timeInDays = world.getTime().getDays(); - entity.send(new WorldtimeResetEvent(timeInDays + timeDiff)); + float timeInDays = world.getTime().getDays(); + entity.send(new WorldtimeResetEvent(timeInDays + timeDiff)); event.consume(); } diff --git a/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java b/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java index 2d35b5762..6e22113e3 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; import org.terasology.engine.input.RegisterBindButton; -/** - */ @RegisterBindButton(id = "decreaseViewDistance", description = "${engine:menu#binding-decrease-view-distance}", mode = ActivateMode.PRESS, category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.END) public class DecreaseViewDistanceButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java b/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java index 0715864c4..a8f397eda 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; import org.terasology.engine.input.RegisterBindButton; -/** - */ @RegisterBindButton(id = "increaseViewDistance", description = "${engine:menu#binding-increase-view-distance}", mode = ActivateMode.PRESS, category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.HOME) public class IncreaseViewDistanceButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java index 99b0bba39..d0a073125 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java @@ -138,23 +138,25 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs if (localPlayerInitialized) { EntityRef entity = localPlayer.getCharacterEntity(); - CharacterMovementComponent characterMovementComponent = entity.getComponent(CharacterMovementComponent.class); + CharacterMovementComponent characterMovementComponent = + entity.getComponent(CharacterMovementComponent.class); processInput(entity, characterMovementComponent); - updateCamera(characterMovementComponent, localPlayer.getViewPosition(new Vector3f()), localPlayer.getViewRotation(new Quaternionf())); + updateCamera(characterMovementComponent, localPlayer.getViewPosition(new Vector3f()), + localPlayer.getViewRotation(new Quaternionf())); } } private void processInput(EntityRef entity, CharacterMovementComponent characterMovementComponent) { lookYaw = (float) ((lookYaw - lookYawDelta) % 360); lookYawDelta = 0f; - lookPitch = (float) Math.clamp(-89, 89,lookPitch + lookPitchDelta); + lookPitch = (float) Math.clamp(-89, 89, lookPitch + lookPitchDelta); lookPitchDelta = 0f; Vector3f relMove = new Vector3f(relativeMovement); relMove.y = 0; - Quaternionf viewRotation = new Quaternionf(); + Quaternionf viewRotation = new Quaternionf(); switch (characterMovementComponent.mode) { case CROUCHING: case WALKING: @@ -177,9 +179,11 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs relMove.y += relativeMovement.y; break; } - // For some reason, Quat4f.rotate is returning NaN for valid inputs. This prevents those NaNs from causing trouble down the line. + // For some reason, Quat4f.rotate is returning NaN for valid inputs. This prevents those NaNs from causing + // trouble down the line. if (relMove.isFinite()) { - entity.send(new CharacterMoveInputEvent(inputSequenceNumber++, lookPitch, lookYaw, relMove, run, crouch, jump, time.getGameDeltaInMs())); + entity.send(new CharacterMoveInputEvent(inputSequenceNumber++, lookPitch, lookYaw, relMove, run, crouch, + jump, time.getGameDeltaInMs())); } jump = false; } @@ -195,8 +199,8 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs } /** - * Auto move is disabled when the associated key is pressed again. - * This cancels the simulated repeated key stroke for the forward input button. + * Auto move is disabled when the associated key is pressed again. This cancels the simulated repeated key stroke + * for the forward input button. */ private void stopAutoMove() { List inputs = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:forwards")); @@ -209,8 +213,8 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs } /** - * Append the input for moving forward to the keyboard command queue to simulate pressing of the forward key. - * For an input that repeats, the key must be in Down state before Repeat state can be applied to it. + * Append the input for moving forward to the keyboard command queue to simulate pressing of the forward key. For an + * input that repeats, the key must be in Down state before Repeat state can be applied to it. */ private void startAutoMove() { isAutoMove = false; @@ -284,7 +288,7 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs @ReceiveEvent(components = {ClientComponent.class}) public void updateStrafeMovement(StrafeMovementAxis event, EntityRef entity) { - relativeMovement.x = (float)event.getValue(); + relativeMovement.x = (float) event.getValue(); event.consume(); } @@ -296,7 +300,7 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs @ReceiveEvent(components = {ClientComponent.class}) public void updateForwardsMovement(ForwardsRealMovementAxis event, EntityRef entity) { - relativeMovement.z = (float)event.getValue(); + relativeMovement.z = (float) event.getValue(); event.consume(); } @@ -308,7 +312,7 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs @ReceiveEvent(components = {ClientComponent.class}) public void updateVerticalMovement(VerticalRealMovementAxis event, EntityRef entity) { - relativeMovement.y = (float)event.getValue(); + relativeMovement.y = (float) event.getValue(); event.consume(); } @@ -444,7 +448,8 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs } @ReceiveEvent(components = {CharacterComponent.class}) - public void onUseItemButton(UseItemButton event, EntityRef entity, CharacterHeldItemComponent characterHeldItemComponent) { + public void onUseItemButton(UseItemButton event, EntityRef entity, + CharacterHeldItemComponent characterHeldItemComponent) { if (!event.isDown()) { return; } @@ -490,8 +495,8 @@ public class LocalPlayerSystem extends BaseComponentSystem implements UpdateSubs } /** - * Special getter that fetches the client entity via the NetworkSystem instead of the LocalPlayer. - * This can be needed in special cases where the local player isn't fully available (TODO: May be a bug?) + * Special getter that fetches the client entity via the NetworkSystem instead of the LocalPlayer. This can be + * needed in special cases where the local player isn't fully available (TODO: May be a bug?) * * @return the EntityRef that the networking system says is the client associated with this player */ diff --git a/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java index 3b82cc3df..a083030f0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java @@ -21,11 +21,11 @@ import org.terasology.engine.entitySystem.systems.RegisterMode; import org.terasology.engine.entitySystem.systems.RegisterSystem; import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.logic.characters.CharacterComponent; -import org.terasology.engine.logic.location.Location; -import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.logic.characters.CharacterHeldItemComponent; import org.terasology.engine.logic.console.commandSystem.annotations.Command; import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam; +import org.terasology.engine.logic.location.Location; +import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.network.ClientComponent; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.logic.VisualComponent; @@ -56,6 +56,7 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement /** * Ensures held item mount point entity exists, attaches it to the character and sets its transform. + * * @param event the activation that triggered the need to consider changing a held item * @param character the character for which we need to consider the held item * @param remotePersonHeldItemMountPointComponent data for the mount point on the remote character @@ -64,7 +65,8 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement public void ensureClientSideEntityOnHeldItemMountPoint(OnActivatedComponent event, EntityRef character, RemotePersonHeldItemMountPointComponent remotePersonHeldItemMountPointComponent) { if (relatesToLocalPlayer(character)) { - logger.debug("ensureClientSideEntityOnHeldItemMountPoint found its given character to relate to the local player, ignoring: {}", character); + logger.debug("ensureClientSideEntityOnHeldItemMountPoint found its given character to relate to the local" + + " player, ignoring: {}", character); return; } @@ -89,15 +91,19 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement } @ReceiveEvent - public void ensureHeldItemIsMountedOnLoad(OnChangedComponent event, EntityRef clientEntity, ClientComponent clientComponent) { + public void ensureHeldItemIsMountedOnLoad(OnChangedComponent event, EntityRef clientEntity, + ClientComponent clientComponent) { if (relatesToLocalPlayer(clientEntity)) { - logger.debug("ensureHeldItemIsMountedOnLoad found its given clientEntity to relate to the local player, ignoring: {}", clientEntity); + logger.debug("ensureHeldItemIsMountedOnLoad found its given clientEntity to relate to the local player, " + + "ignoring: {}", clientEntity); return; } if (clientEntity.exists() && clientComponent.character != EntityRef.NULL) { - logger.debug("ensureHeldItemIsMountedOnLoad says a given clientEntity exists, has a character, and isn't related to the local player: {}", clientEntity); - CharacterHeldItemComponent characterHeldItemComponent = clientComponent.character.getComponent(CharacterHeldItemComponent.class); + logger.debug("ensureHeldItemIsMountedOnLoad says a given clientEntity exists, has a character, and isn't " + + "related to the local player: {}", clientEntity); + CharacterHeldItemComponent characterHeldItemComponent = + clientComponent.character.getComponent(CharacterHeldItemComponent.class); if (characterHeldItemComponent != null && !(clientComponent.character.equals(localPlayer.getCharacterEntity()))) { linkHeldItemLocationForRemotePlayer(characterHeldItemComponent.selectedItem, clientComponent.character); } @@ -107,68 +113,86 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement } @Command(shortDescription = "Sets the held item mount point translation for remote characters") - public void setRemotePlayersHeldItemMountPointTranslations(@CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { + public void setRemotePlayersHeldItemMountPointTranslations(@CommandParam("x") float x, @CommandParam("y") float y + , @CommandParam("z") float z) { for (EntityRef remotePlayer : entityManager.getEntitiesWith(RemotePersonHeldItemMountPointComponent.class)) { - RemotePersonHeldItemMountPointComponent remoteMountPointComponent = remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); + RemotePersonHeldItemMountPointComponent remoteMountPointComponent = + remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); remoteMountPointComponent.translate.set(x, y, z); } } @Command(shortDescription = "Sets the held item mount point rotation for remote characters") - public void setRemotePlayersHeldItemMountPointRotations(@CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { + public void setRemotePlayersHeldItemMountPointRotations(@CommandParam("x") float x, @CommandParam("y") float y, + @CommandParam("z") float z) { for (EntityRef remotePlayer : entityManager.getEntitiesWith(RemotePersonHeldItemMountPointComponent.class)) { - RemotePersonHeldItemMountPointComponent remoteMountPointComponent = remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); + RemotePersonHeldItemMountPointComponent remoteMountPointComponent = + remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); remoteMountPointComponent.rotateDegrees.set(x, y, z); } } @ReceiveEvent - public void onHeldItemActivated(OnActivatedComponent event, EntityRef player, CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { + public void onHeldItemActivated(OnActivatedComponent event, EntityRef player, + CharacterHeldItemComponent heldItemComponent, + CharacterComponent characterComponents) { if (relatesToLocalPlayer(player)) { - logger.debug("onHeldItemActivated found its given player to relate to the local player, ignoring: {}", player); + logger.debug("onHeldItemActivated found its given player to relate to the local player, ignoring: {}", + player); return; } - logger.debug("onHeldItemActivated says the given player is not the local player's character entity: {}", player); + logger.debug("onHeldItemActivated says the given player is not the local player's character entity: {}", + player); EntityRef newItem = heldItemComponent.selectedItem; linkHeldItemLocationForRemotePlayer(newItem, player); } @ReceiveEvent - public void onHeldItemChanged(OnChangedComponent event, EntityRef character, CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { + public void onHeldItemChanged(OnChangedComponent event, EntityRef character, + CharacterHeldItemComponent heldItemComponent, + CharacterComponent characterComponents) { if (relatesToLocalPlayer(character)) { - logger.debug("onHeldItemChanged found its given character to relate to the local player, ignoring: {}", character); + logger.debug("onHeldItemChanged found its given character to relate to the local player, ignoring: {}", + character); return; } - logger.debug("onHeldItemChanged says the given character is not the local player's character entity: {}", character); + logger.debug("onHeldItemChanged says the given character is not the local player's character entity: {}", + character); EntityRef newItem = heldItemComponent.selectedItem; linkHeldItemLocationForRemotePlayer(newItem, character); } /** * Changes held item entity. - * - * Detaches old held item and removes its components. Adds components to new held item and - * attaches it to the mount point entity. + *

+ * Detaches old held item and removes its components. Adds components to new held item and attaches it to the mount + * point entity. */ private void linkHeldItemLocationForRemotePlayer(EntityRef newItem, EntityRef player) { if (relatesToLocalPlayer(player)) { - logger.debug("linkHeldItemLocationForRemotePlayer called with an entity that relates to the local player, ignoring{}", player); + logger.debug("linkHeldItemLocationForRemotePlayer called with an entity that relates to the local player," + + " ignoring{}", player); return; } // Find out if there is a current held item that maps to this player EntityRef currentHeldItem = EntityRef.NULL; for (EntityRef heldItemCandidate : entityManager.getEntitiesWith(ItemIsRemotelyHeldComponent.class)) { - EntityRef remotePlayerCandidate = heldItemCandidate.getComponent(ItemIsRemotelyHeldComponent.class).remotePlayer; - logger.debug("For held item candidate {} got its player candidate as {}", heldItemCandidate, remotePlayerCandidate); + EntityRef remotePlayerCandidate = + heldItemCandidate.getComponent(ItemIsRemotelyHeldComponent.class).remotePlayer; + logger.debug("For held item candidate {} got its player candidate as {}", heldItemCandidate, + remotePlayerCandidate); if (remotePlayerCandidate.equals(player)) { - logger.debug("Thinking we found a match with player {} so counting this held item as relevant for processing", player); + logger.debug("Thinking we found a match with player {} so counting this held item as relevant for " + + "processing", player); currentHeldItem = heldItemCandidate; - // If we found an existing item yet the situation calls for emptying the players hand then we just need to remove the old item + // If we found an existing item yet the situation calls for emptying the players hand then we just + // need to remove the old item if (newItem.equals(EntityRef.NULL)) { - logger.debug("Found an existing held item but the new request was to no longer hold anything so destroying {}", currentHeldItem); + logger.debug("Found an existing held item but the new request was to no longer hold anything so " + + "destroying {}", currentHeldItem); currentHeldItem.destroy(); return; } @@ -178,7 +202,8 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement // In the case of an actual change of item other than an empty hand we need to hook up a new held item entity if (newItem != null && !newItem.equals(EntityRef.NULL) && !newItem.equals(currentHeldItem)) { - RemotePersonHeldItemMountPointComponent mountPointComponent = player.getComponent(RemotePersonHeldItemMountPointComponent.class); + RemotePersonHeldItemMountPointComponent mountPointComponent = + player.getComponent(RemotePersonHeldItemMountPointComponent.class); if (mountPointComponent != null) { //currentHeldItem is at this point the old item @@ -204,7 +229,8 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement itemIsRemotelyHeldComponent.remotePlayer = player; currentHeldItem.addComponent(itemIsRemotelyHeldComponent); - RemotePersonHeldItemTransformComponent heldItemTransformComponent = currentHeldItem.getComponent(RemotePersonHeldItemTransformComponent.class); + RemotePersonHeldItemTransformComponent heldItemTransformComponent = + currentHeldItem.getComponent(RemotePersonHeldItemTransformComponent.class); if (heldItemTransformComponent == null) { heldItemTransformComponent = new RemotePersonHeldItemTransformComponent(); currentHeldItem.addComponent(heldItemTransformComponent); @@ -219,23 +245,29 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement heldItemTransformComponent.scale); } } else { - logger.info("Somehow ended up in the else during linkHeldItemLocationForRemotePlayer - current item was {} and new item {}", currentHeldItem, newItem); + logger.info("Somehow ended up in the else during linkHeldItemLocationForRemotePlayer - current item was " + + "{} and new item {}", currentHeldItem, newItem); } } /** - * Modifies the remote players' held item mount points to show and move their held items at their location. Clean up no longer needed held item entities. - * - * TODO: Also responsible for catching characters without current held item entities and then create them. Should be moved elsewhere + * Modifies the remote players' held item mount points to show and move their held items at their location. Clean up + * no longer needed held item entities. + *

+ * TODO: Also responsible for catching characters without current held item entities and then create them. Should be + * moved elsewhere */ @Override public void update(float delta) { // Make a set of all held items that exist so we can review them and later toss any no longer needed - Set heldItemsForReview = Sets.newHashSet(entityManager.getEntitiesWith(ItemIsRemotelyHeldComponent.class)); + Set heldItemsForReview = + Sets.newHashSet(entityManager.getEntitiesWith(ItemIsRemotelyHeldComponent.class)); - // Note that the inclusion of PlayerCharacterComponent excludes "characters" like Gooey. In the future such critters may also want held items - for (EntityRef remotePlayer : entityManager.getEntitiesWith(CharacterComponent.class, PlayerCharacterComponent.class)) { + // Note that the inclusion of PlayerCharacterComponent excludes "characters" like Gooey. In the future such + // critters may also want held items + for (EntityRef remotePlayer : entityManager.getEntitiesWith(CharacterComponent.class, + PlayerCharacterComponent.class)) { if (relatesToLocalPlayer(remotePlayer)) { continue; } @@ -245,7 +277,8 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement Iterator heldItermsIterator = heldItemsForReview.iterator(); while (heldItermsIterator.hasNext()) { EntityRef heldItemCandidate = heldItermsIterator.next(); - ItemIsRemotelyHeldComponent itemIsRemotelyHeldComponent = heldItemCandidate.getComponent(ItemIsRemotelyHeldComponent.class); + ItemIsRemotelyHeldComponent itemIsRemotelyHeldComponent = + heldItemCandidate.getComponent(ItemIsRemotelyHeldComponent.class); if (itemIsRemotelyHeldComponent.remotePlayer.equals(remotePlayer)) { currentHeldItem = heldItemCandidate; heldItermsIterator.remove(); @@ -254,10 +287,12 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement } - // If an associated held item entity does *not* exist yet, consider making one if the player has an item selected + // If an associated held item entity does *not* exist yet, consider making one if the player has an item + // selected if (currentHeldItem == EntityRef.NULL) { if (remotePlayer.hasComponent(CharacterHeldItemComponent.class)) { - CharacterHeldItemComponent characterHeldItemComponent = remotePlayer.getComponent(CharacterHeldItemComponent.class); + CharacterHeldItemComponent characterHeldItemComponent = + remotePlayer.getComponent(CharacterHeldItemComponent.class); if (characterHeldItemComponent != null && !characterHeldItemComponent.selectedItem.equals(EntityRef.NULL)) { linkHeldItemLocationForRemotePlayer(remotePlayer.getComponent(CharacterHeldItemComponent.class).selectedItem, remotePlayer); } @@ -265,13 +300,16 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement } // get the remote person mount point - CharacterHeldItemComponent characterHeldItemComponent = remotePlayer.getComponent(CharacterHeldItemComponent.class); - RemotePersonHeldItemMountPointComponent mountPointComponent = remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); + CharacterHeldItemComponent characterHeldItemComponent = + remotePlayer.getComponent(CharacterHeldItemComponent.class); + RemotePersonHeldItemMountPointComponent mountPointComponent = + remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); if (characterHeldItemComponent == null || mountPointComponent == null) { continue; } - LocationComponent locationComponent = mountPointComponent.mountPointEntity.getComponent(LocationComponent.class); + LocationComponent locationComponent = + mountPointComponent.mountPointEntity.getComponent(LocationComponent.class); if (locationComponent == null) { continue; } @@ -286,9 +324,9 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement float addPitch = 15f * animateAmount; float addYaw = 10f * animateAmount; locationComponent.setLocalRotation(new Quaternionf().rotationYXZ( - Math.toRadians(mountPointComponent.rotateDegrees.y + addYaw), - Math.toRadians(mountPointComponent.rotateDegrees.x + addPitch), - Math.toRadians(mountPointComponent.rotateDegrees.z))); + Math.toRadians(mountPointComponent.rotateDegrees.y + addYaw), + Math.toRadians(mountPointComponent.rotateDegrees.x + addPitch), + Math.toRadians(mountPointComponent.rotateDegrees.z))); Vector3f offset = new Vector3f(0.05f * animateAmount, -0.24f * animateAmount, 0f); offset.add(mountPointComponent.translate); locationComponent.setLocalPosition(offset); @@ -306,26 +344,35 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement @Override public void postBegin() { /* - // Go through all known remote players already present and make sure they have their currently equipped items defined - // TODO: This catches the scenario in which a player logs in and can see other already-connected players' held items - // But it doesn't cover when a new player then connects later. Only when that player takes an action causing an event handled in this System - // The if (currentHeldItem == EntityRef.NULL) block in the update method catches BOTH scenarios, but is in a tick-loop - // This snippet plus a separate fix that catches join events by other players should be able to do the work as two one-time events only + // Go through all known remote players already present and make sure they have their currently equipped items + defined + // TODO: This catches the scenario in which a player logs in and can see other already-connected players' + held items + // But it doesn't cover when a new player then connects later. Only when that player takes an action causing + an event handled in this System + // The if (currentHeldItem == EntityRef.NULL) block in the update method catches BOTH scenarios, but is in a + tick-loop + // This snippet plus a separate fix that catches join events by other players should be able to do the work + as two one-time events only for (EntityRef remotePlayer : entityManager.getEntitiesWith(CharacterComponent.class, PlayerCharacterComponent.class, CharacterHeldItemComponent.class, RemotePersonHeldItemMountPointComponent.class)) { if (!relatesToLocalPlayer(remotePlayer)) { - logger.info("Found a remote player to process during postBegin, selected item is {}", remotePlayer.getComponent(CharacterHeldItemComponent.class).selectedItem); - linkHeldItemLocationForRemotePlayer(remotePlayer.getComponent(CharacterHeldItemComponent.class).selectedItem, remotePlayer); + logger.info("Found a remote player to process during postBegin, selected item is {}", remotePlayer + .getComponent(CharacterHeldItemComponent.class).selectedItem); + linkHeldItemLocationForRemotePlayer(remotePlayer.getComponent(CharacterHeldItemComponent.class) + .selectedItem, remotePlayer); } } */ } /** - * Checks a given entity in a variety of ways to see if it is immediately related to a local player. - * TODO: Is a bit of a shotgun blast approach to throwing out undesired player/client/character entities. Needs a more surgical approach. + * Checks a given entity in a variety of ways to see if it is immediately related to a local player. TODO: Is a bit + * of a shotgun blast approach to throwing out undesired player/client/character entities. Needs a more surgical + * approach. + * * @param entity the entity to check (probably a player, client, or character entity) * @return true if any such check passes, otherwise false */ @@ -347,10 +394,12 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement } // In case we're in a scenario where localPlayer is unreliable this is an alternative way to check - // This was needed in one case with headless + one client where an event triggered when localPlayer wasn't set right + // This was needed in one case with headless + one client where an event triggered when localPlayer wasn't + // set right EntityRef networkSystemProvidedClientEntity = localPlayerSystem.getClientEntityViaNetworkSystem(); if (entity.equals(networkSystemProvidedClientEntity)) { - logger.debug("checkForLocalPlayer found its entity to match the network system provided local client entity! {}", entity); + logger.debug("checkForLocalPlayer found its entity to match the network system provided local client " + + "entity! {}", entity); } if (entity.hasComponent(CharacterComponent.class)) { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/event/RespawnRequestEvent.java b/engine/src/main/java/org/terasology/engine/logic/players/event/RespawnRequestEvent.java index 4ce569677..de39d2c6f 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/event/RespawnRequestEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/event/RespawnRequestEvent.java @@ -6,8 +6,6 @@ package org.terasology.engine.logic.players.event; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent public class RespawnRequestEvent implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/math/Diamond3iIterable.java b/engine/src/main/java/org/terasology/engine/math/Diamond3iIterable.java index 5544ccf02..b7e2227e8 100644 --- a/engine/src/main/java/org/terasology/engine/math/Diamond3iIterable.java +++ b/engine/src/main/java/org/terasology/engine/math/Diamond3iIterable.java @@ -80,7 +80,7 @@ public final class Diamond3iIterable implements Iterable { public Iterator iterator() { Vector3i pos = new Vector3i(); final int[] level = {this.startDistance}; - final Vector3i offset = new Vector3i(-this.startDistance,0,0); + final Vector3i offset = new Vector3i(-this.startDistance, 0, 0); return new Iterator() { @Override @@ -126,7 +126,7 @@ public final class Diamond3iIterable implements Iterable { * @param origin center region for iterator * @param endDistance maximums radius */ - private Builder(Vector3ic origin, int endDistance){ + private Builder(Vector3ic origin, int endDistance) { this.origin = origin; this.endDistance = endDistance + 1; } @@ -141,7 +141,7 @@ public final class Diamond3iIterable implements Iterable { } public Diamond3iIterable build() { - return new Diamond3iIterable(origin,startDistance,endDistance); + return new Diamond3iIterable(origin, startDistance, endDistance); } } diff --git a/engine/src/main/java/org/terasology/engine/math/Direction.java b/engine/src/main/java/org/terasology/engine/math/Direction.java index ffb0c5615..e24a41e0b 100644 --- a/engine/src/main/java/org/terasology/engine/math/Direction.java +++ b/engine/src/main/java/org/terasology/engine/math/Direction.java @@ -2,16 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.math; -import com.google.common.collect.Maps; -import net.logstash.logback.encoder.org.apache.commons.lang.UnhandledException; import org.joml.Math; import org.joml.Vector3f; import org.joml.Vector3fc; import org.joml.Vector3i; import org.joml.Vector3ic; -import java.util.EnumMap; - /** * An enumeration of the axis of the world from the player perspective. There is also * diff --git a/engine/src/main/java/org/terasology/engine/math/SpiralIterable.java b/engine/src/main/java/org/terasology/engine/math/SpiralIterable.java index e36ba4e6b..23c5f427b 100644 --- a/engine/src/main/java/org/terasology/engine/math/SpiralIterable.java +++ b/engine/src/main/java/org/terasology/engine/math/SpiralIterable.java @@ -17,7 +17,7 @@ import java.util.NoSuchElementException; *

* The iterating vector is reused. Do not attempt to store the instance e.g. in a collection. */ -public class SpiralIterable implements Iterable{ +public class SpiralIterable implements Iterable { /** * (MAX_SIDELEN * 2 + 1) ^2 must be < Integer.MAX_VALUE diff --git a/engine/src/main/java/org/terasology/engine/monitoring/Activity.java b/engine/src/main/java/org/terasology/engine/monitoring/Activity.java index f68801c2e..7f883cdc9 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/Activity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/Activity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; /** diff --git a/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java index 8b62a82d2..c0ff506ac 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; import gnu.trove.map.TObjectDoubleMap; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java b/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java index 00a2c8e8f..37111de52 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; /** diff --git a/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java index 416541847..7c310e78c 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java index 260e72edb..39c5c3993 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import org.terasology.engine.rendering.primitives.ChunkMesh; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java index e4638f0e1..2c37409bd 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java index 6c3f37dd9..ecffb77a1 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import com.google.common.base.Preconditions; @@ -60,7 +47,8 @@ public class ChunkMonitorEntry { public void addChunk(Chunk value) { Preconditions.checkNotNull(value, "The parameter 'value' must not be null"); - Preconditions.checkArgument(pos.equals(value.getPosition(new Vector3i())), "Expected chunk for position {} but got position {} instead", pos, value.getPosition(new Vector3i())); + Preconditions.checkArgument(pos.equals(value.getPosition(new Vector3i())), + "Expected chunk for position {} but got position {} instead", pos, value.getPosition(new Vector3i())); purge(); chunks.add(new WeakReference<>(value)); } diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java index b9ccb7cf1..098c074b4 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java index d17485669..067287ff4 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import javax.swing.JTabbedPane; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java index fdbea3832..9a9078286 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java index 2ac301b32..a21c05e44 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import javax.swing.JPanel; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java index e5c7e2c59..48b4d1640 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java index f5903b09e..3d4a54f4d 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import com.google.common.eventbus.Subscribe; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java index 80ef4719f..ebee57662 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import org.terasology.engine.monitoring.Activity; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java index 80c43f074..a59a73915 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java @@ -1,26 +1,11 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import gnu.trove.map.TObjectDoubleMap; import gnu.trove.map.hash.TObjectDoubleHashMap; import org.terasology.engine.monitoring.Activity; -/** - */ public class NullPerformanceMonitor implements PerformanceMonitorInternal { private static final NullActivity NULL_ACTIVITY = new NullActivity(); private TObjectDoubleMap metrics = new TObjectDoubleHashMap<>(); diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java index 908019d5b..e6ed6d2f3 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import org.terasology.engine.monitoring.ThreadActivity; -/** - */ public class NullThreadActivity implements ThreadActivity { @Override public void close() { diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java index 23ea49225..53433cf90 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java index c3af7c4f0..5d214db8f 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import gnu.trove.map.TObjectDoubleMap; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java index 247f0319b..6eb4a2cd4 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import java.util.List; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java index d4b48fd48..dc7bf310b 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import com.google.common.base.Objects; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java index 445b77610..8e6ac159b 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import org.terasology.engine.monitoring.ThreadActivity; -/** - */ public class ThreadActivityInternal implements ThreadActivity { private SingleThreadMonitor monitor; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java index b8a346112..90a6403f1 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/package-info.java b/engine/src/main/java/org/terasology/engine/monitoring/package-info.java index 6843c0c82..025146f8b 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/package-info.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.monitoring; diff --git a/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java b/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java index b664e46d6..9fe80261d 100644 --- a/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/Client.java b/engine/src/main/java/org/terasology/engine/network/Client.java index 00d3ae1d8..c21ddea91 100644 --- a/engine/src/main/java/org/terasology/engine/network/Client.java +++ b/engine/src/main/java/org/terasology/engine/network/Client.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ClientComponent.java b/engine/src/main/java/org/terasology/engine/network/ClientComponent.java index 3d0626378..315e8ed49 100644 --- a/engine/src/main/java/org/terasology/engine/network/ClientComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/ClientComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java b/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java index 4f35adc5b..5a67ea38f 100644 --- a/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java b/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java index f1365048b..6a3ebb388 100644 --- a/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java +++ b/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/network/ColorComponent.java b/engine/src/main/java/org/terasology/engine/network/ColorComponent.java index 741bb5c35..2088d408e 100644 --- a/engine/src/main/java/org/terasology/engine/network/ColorComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/ColorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java b/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java index 0d750bf66..9e02c1ce2 100644 --- a/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java +++ b/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; -/** - */ public enum FieldReplicateType { SERVER_TO_CLIENT(false), SERVER_TO_OWNER(false), diff --git a/engine/src/main/java/org/terasology/engine/network/JoinStatus.java b/engine/src/main/java/org/terasology/engine/network/JoinStatus.java index 530acac5f..1bbcf66b6 100644 --- a/engine/src/main/java/org/terasology/engine/network/JoinStatus.java +++ b/engine/src/main/java/org/terasology/engine/network/JoinStatus.java @@ -1,22 +1,7 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; -/** - */ public interface JoinStatus { enum Status { diff --git a/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java b/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java index f10aa6f6f..28ab69e5b 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java +++ b/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java b/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java index 5cff99417..8650db63f 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; -/** - */ public class NetworkComponent implements Component { public ReplicateMode replicateMode = ReplicateMode.RELEVANT; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java b/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java index 3cd574ad5..90cc5de9c 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java b/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java index 501334d92..3f5d5e688 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkMode.java b/engine/src/main/java/org/terasology/engine/network/NetworkMode.java index 0f061b50c..9020f25de 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkMode.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkMode.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java b/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java index 75b596bde..79c4c447f 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NoReplicate.java b/engine/src/main/java/org/terasology/engine/network/NoReplicate.java index ba3f1b31c..bb7a9bd78 100644 --- a/engine/src/main/java/org/terasology/engine/network/NoReplicate.java +++ b/engine/src/main/java/org/terasology/engine/network/NoReplicate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java b/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java index 3510462dd..282f5209b 100644 --- a/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/PingService.java b/engine/src/main/java/org/terasology/engine/network/PingService.java index adc77c3af..836fe7766 100644 --- a/engine/src/main/java/org/terasology/engine/network/PingService.java +++ b/engine/src/main/java/org/terasology/engine/network/PingService.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java b/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java index 36f602e6e..7bafa8f1c 100644 --- a/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java b/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java index 9bc5bed64..77be6630f 100644 --- a/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/network/Replicate.java b/engine/src/main/java/org/terasology/engine/network/Replicate.java index 05142a67b..b891a90b5 100644 --- a/engine/src/main/java/org/terasology/engine/network/Replicate.java +++ b/engine/src/main/java/org/terasology/engine/network/Replicate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java b/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java index 0199fea23..ed8f5c99f 100644 --- a/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/Server.java b/engine/src/main/java/org/terasology/engine/network/Server.java index 21c1898e0..449cacc58 100644 --- a/engine/src/main/java/org/terasology/engine/network/Server.java +++ b/engine/src/main/java/org/terasology/engine/network/Server.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; @@ -21,8 +8,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.protobuf.NetData; import org.terasology.engine.world.chunks.remoteChunkProvider.ChunkReadyListener; -/** - */ public interface Server extends ChunkReadyListener { EntityRef getClientEntity(); diff --git a/engine/src/main/java/org/terasology/engine/network/ServerEvent.java b/engine/src/main/java/org/terasology/engine/network/ServerEvent.java index 80c80a392..6fcf8c712 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java b/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java index 0fdebad00..b0e7417b9 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java b/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java index 2846d15d7..2bcd99624 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java b/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java index 0365becca..9f3cd5c70 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.entity.EntityManager; diff --git a/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java b/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java index cf49e4904..0ac5a0794 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; diff --git a/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java b/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java index 8f2e31b09..25b70e460 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; diff --git a/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java b/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java index 575d92701..921ca21aa 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java b/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java index ea3569207..0c1517224 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java b/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java index 61b50f7a6..ace0503dc 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java b/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java index cae07abdc..61e443277 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/package-info.java b/engine/src/main/java/org/terasology/engine/network/events/package-info.java index 549e1e4e0..f5333c7c9 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/package-info.java +++ b/engine/src/main/java/org/terasology/engine/network/events/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.network.events; diff --git a/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java b/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java index c49eabe9d..ad13b939e 100644 --- a/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java +++ b/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.exceptions; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java b/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java index 009494dc6..7253ae06f 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java index d56553868..7308873f5 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java index 068ed5495..6626b6869 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java b/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java index 820ea5cfe..ddbb6a925 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import com.google.common.primitives.Bytes; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java b/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java index af4a1de0e..031a0083a 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import com.google.common.util.concurrent.AtomicDouble; import org.terasology.engine.network.JoinStatus; -/** - */ public class JoinStatusImpl implements JoinStatus { private Status status = Status.IN_PROGRESS; private String currentActivity = ""; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java index 5bafe2dc3..51df17553 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java b/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java index defff58cc..7484210d6 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java b/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java index 7d04e4dad..2b2b1d1c8 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.entity.internal.BaseEntityRef; import org.terasology.engine.entitySystem.entity.internal.DefaultRefStrategy; import org.terasology.engine.network.NetworkComponent; -/** - */ public class NetworkClientRefStrategy extends DefaultRefStrategy { private NetworkSystemImpl system; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java b/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java index ccb7ac48b..e09cdfeab 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java b/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java index ad12a4741..19e3570f2 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java @@ -71,7 +71,6 @@ import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.block.family.BlockFamily; import org.terasology.engine.world.chunks.remoteChunkProvider.RemoteChunkProvider; import org.terasology.engine.world.generator.WorldGenerator; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.module.Module; import org.terasology.nui.Color; import org.terasology.persistence.typeHandling.TypeHandlerLibrary; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java index 5a541d12e..24021b0b4 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; @@ -22,9 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -/** - * - */ + public class ServerConnectionHandler extends ChannelInboundHandlerAdapter { private static final Logger logger = LoggerFactory.getLogger(ServerConnectionHandler.class); diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java index a08739b45..3af176806 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java index a1c852929..8e72f7881 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java index 854b2bb4c..a224fb570 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java index ba04ef8df..d92a56ae7 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import io.netty.channel.ChannelHandlerContext; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java index 2bac2d8a1..39c1befda 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal.pipelineFactory; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java index 6190d9645..ab463d960 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal.pipelineFactory; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java index bd6caf956..d8b847cf4 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal.pipelineFactory; diff --git a/engine/src/main/java/org/terasology/engine/network/package-info.java b/engine/src/main/java/org/terasology/engine/network/package-info.java index cbf8acdc6..7190c3934 100644 --- a/engine/src/main/java/org/terasology/engine/network/package-info.java +++ b/engine/src/main/java/org/terasology/engine/network/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java b/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java index 16c3415f4..07d8d7ac2 100644 --- a/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.serialization; diff --git a/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java b/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java index dd46ca608..31d9a426d 100644 --- a/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.serialization; diff --git a/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java b/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java index f75f7e1c8..eac5f1fc5 100644 --- a/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.serialization; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleData.java b/engine/src/main/java/org/terasology/engine/particles/ParticleData.java index ffd499a3f..70a6a9f3c 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleData.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.joml.Vector2f; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java b/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java index a3253d82c..8cdcbdcdc 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java b/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java index 773605187..4a5fb9cb9 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java index 7735dc3bd..9389a3c01 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java index aad482cfa..89ace8e87 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.terasology.engine.core.module.ModuleManager; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java index ad8256cf6..8b520a770 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components; import org.joml.Vector2f; @@ -20,9 +7,7 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.rendering.assets.texture.Texture; -/** - * - */ + @API public class ParticleDataSpriteComponent implements Component { /** diff --git a/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java index 65e7a34ee..55b52f4ab 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java index da730374b..15088f43c 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.affectors; import org.joml.Vector3f; @@ -20,9 +7,7 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.network.Replicate; -/** - * - */ + @API public class AccelerationAffectorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java index 121407c5e..0d1bb366e 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java @@ -1,26 +1,11 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.affectors; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class VelocityAffectorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java index 4cb06c0ca..ab5468066 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector4f; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class ColorRangeGeneratorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java index 9f7b957b7..4b1323028 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java @@ -1,26 +1,11 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class EnergyRangeGeneratorComponent implements Component { public float minEnergy = 100.0f; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java index 86240ad26..305c323ee 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class PositionRangeGeneratorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java index fe34a146e..2c6ec90e4 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class ScaleRangeGeneratorComponent implements Component { public Vector3f minScale; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java index 7b32f4007..8f4f7e04b 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector2f; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java index 1cbb6cde7..69c884d51 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java b/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java index 9079ff06b..0df00c432 100644 --- a/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java +++ b/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java index 0920c2291..86913cf8c 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions; import org.terasology.engine.particles.ParticleDataMask; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java index 801cd79c2..3c2577821 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions; import org.terasology.gestalt.module.sandbox.API; @@ -28,4 +15,4 @@ import java.lang.annotation.Target; @API @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface RegisterParticleSystemFunction {} +public @interface RegisterParticleSystemFunction { } diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java index e4571df87..a5d1cd0f5 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.affectors; import org.terasology.engine.particles.ParticleData; @@ -21,9 +8,7 @@ import org.terasology.engine.particles.components.affectors.AccelerationAffector import org.terasology.engine.particles.functions.RegisterParticleSystemFunction; import org.terasology.engine.utilities.random.Random; -/** - * - */ + @RegisterParticleSystemFunction() public final class AccelerationAffectorFunction extends AffectorFunction { public AccelerationAffectorFunction() { diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java index 05eb138dc..2f1eb910b 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.affectors; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java index ab7d3a01d..d252b401c 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.affectors; import org.terasology.engine.particles.ParticleData; @@ -21,9 +8,7 @@ import org.terasology.engine.particles.components.affectors.VelocityAffectorComp import org.terasology.engine.particles.functions.RegisterParticleSystemFunction; import org.terasology.engine.utilities.random.Random; -/** - * - */ + @RegisterParticleSystemFunction() public final class VelocityAffectorFunction extends AffectorFunction { public VelocityAffectorFunction() { diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java index 70bbe0461..7fadf55ca 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java index 271ee109d..d7f6a00dc 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java index f857708e1..da9ad2afc 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java index 3421c42a5..6e3b57d88 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java index c771418ed..7d3cbef18 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java index ba5fddf7f..6deec569a 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.joml.Vector2f; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java index 0f9ba4924..0074608cb 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java b/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java index c8578e282..92189e4e8 100644 --- a/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java +++ b/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.rendering; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.particles.ParticlePool; -/** - * - */ + @API public final class ParticleRenderingData { public final E particleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java index da90486bb..0693ff259 100644 --- a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java +++ b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.updating; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java index ef149748d..df60a3f60 100644 --- a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java +++ b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.updating; diff --git a/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java b/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java index 27032e7ab..0374d3f9d 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java +++ b/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.joml.Vector3i; diff --git a/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java b/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java index 4bc76c7e6..8c5827fc2 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java +++ b/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.joml.Vector3fc; import org.terasology.engine.entitySystem.entity.EntityRef; -/** - */ public interface PlayerStore { /** diff --git a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java index aa59669fc..6e332f7d7 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java +++ b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; diff --git a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java index 7b2b78e14..b36554c82 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java +++ b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; diff --git a/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java b/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java index 4a4827202..6cd7644f2 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java +++ b/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.terasology.engine.core.TerasologyConstants; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java b/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java index 384efcb6d..cc399c75a 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java b/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java index e0ac80234..b3d7fb669 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager; @@ -24,8 +11,6 @@ import org.terasology.engine.world.chunks.Chunk; import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager; import org.terasology.engine.world.chunks.internal.ChunkSerializer; -/** - */ final class ChunkStoreInternal implements ChunkStore { private Vector3i chunkPosition; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java index 757e8ae5b..eb6c6ac60 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java index b0c117f76..03bbf1381 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java index 00b3198f7..6021a4ab9 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java index a4269f555..0ec0a492e 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; /** diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java index a3e07f307..b0e765bea 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java index 4e6494446..ab874f68d 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; @@ -26,8 +13,6 @@ import org.terasology.protobuf.EntityData; import java.util.Map; -/** - */ final class EntityRestorer { private EngineEntityManager entityManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java index 548beaa0b..2d929c916 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.MapMaker; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java index 1540b56b5..2f37667cb 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java b/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java index 617e69506..76a526adc 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java index 14d3714eb..3fd3e3e13 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; @@ -30,8 +17,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -/** - */ final class GlobalStoreBuilder { private final long nextEntityId; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java index a31642345..f2858c19d 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; @@ -39,8 +26,6 @@ import org.terasology.protobuf.EntityData; import java.util.Map; import java.util.Optional; -/** - */ final class GlobalStoreLoader { private static final Logger logger = LoggerFactory.getLogger(GlobalStoreLoader.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java index 0a5658f5a..6440396a7 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Sets; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java index 14eb73118..eb6db88d5 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.joml.Vector3f; @@ -25,8 +12,6 @@ import org.terasology.protobuf.EntityData; import java.util.Map; -/** - */ final class PlayerStoreInternal implements PlayerStore { static final String CHARACTER = "character"; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java b/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java index 3d15479ba..20655d8fc 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java index e524bdd30..4e528e9b4 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java index 0d013955f..dcbb31d32 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java index bd60757e6..b6cd1a0ef 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; /** diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java b/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java index e8cb4f4a4..115109c9f 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.joml.Vector3i; @@ -22,8 +9,6 @@ import org.terasology.engine.game.GameManifest; import java.nio.file.Path; -/** - */ public class StoragePathProvider { private static final String PLAYERS_PATH = "players"; private static final String WORLDS_PATH = "worlds"; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java index 1f10e78d9..160d6d24d 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java index b7cc4d8ce..c020ddf75 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; import com.google.gson.Gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java index 193d2711b..986272e57 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java @@ -24,8 +24,6 @@ import org.terasology.protobuf.EntityData; import java.util.Map; -/** - */ public class EventSerializer { private static final Logger logger = LoggerFactory.getLogger(ComponentSerializer.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java index 3a3a0d387..f96a4eb70 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java @@ -31,8 +31,6 @@ import org.terasology.protobuf.EntityData; import java.util.Map; import java.util.Set; -/** - */ public class NetworkEntitySerializer { private static final Logger logger = LoggerFactory.getLogger(NetworkEntitySerializer.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java index 86274e6b0..746c14e46 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java index d9d1812bc..a6ff384f0 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; import com.google.common.collect.ArrayListMultimap; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java index 600553cf8..1bf72160e 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java index f70856f15..01d7f2b01 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java index c0b69f45e..e862224e9 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java @@ -10,8 +10,6 @@ import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; import java.util.Optional; -/** - */ public class AssetTypeHandler extends StringRepresentationTypeHandler { private Class assetClass; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java index 23a63d7b2..844612a4c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java @@ -6,8 +6,6 @@ import org.terasology.engine.world.block.Block; import org.terasology.engine.world.block.BlockManager; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class BlockTypeHandler extends StringRepresentationTypeHandler { private BlockManager blockManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java index 307da20b3..be41c053c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java @@ -4,9 +4,7 @@ package org.terasology.engine.persistence.typeHandling.extensionTypes; import org.lwjgl.BufferUtils; -import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.primitives.ChunkMesh; -import org.terasology.engine.rendering.primitives.ChunkTessellator; import org.terasology.persistence.typeHandling.PersistedData; import org.terasology.persistence.typeHandling.PersistedDataSerializer; import org.terasology.persistence.typeHandling.TypeHandler; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java index 3ba39d834..4de6c4932 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java @@ -7,8 +7,6 @@ import org.terasology.engine.physics.CollisionGroup; import org.terasology.engine.physics.CollisionGroupManager; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class CollisionGroupTypeHandler extends StringRepresentationTypeHandler { private CollisionGroupManager groupManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java index 61377cf41..6f6ff8a9e 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java @@ -13,8 +13,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.List; import java.util.Optional; -/** - */ public class EntityRefTypeHandler extends TypeHandler { private EngineEntityManager entityManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java index acaa109e7..fdb2940ec 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java @@ -6,8 +6,6 @@ package org.terasology.engine.persistence.typeHandling.extensionTypes; import org.terasology.gestalt.naming.Name; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class NameTypeHandler extends StringRepresentationTypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java index ae36eba00..ab003475a 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java @@ -7,8 +7,6 @@ import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.engine.utilities.Assets; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class PrefabTypeHandler extends StringRepresentationTypeHandler { public PrefabTypeHandler() { diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java index e0fa00e11..daaeaae40 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java @@ -12,8 +12,6 @@ import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; import java.util.Optional; -/** - */ public class TextureRegionTypeHandler extends StringRepresentationTypeHandler { private static final Logger logger = LoggerFactory.getLogger(TextureRegionTypeHandler.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java index 860784369..e96045e9d 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java @@ -12,8 +12,6 @@ import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; import java.util.Optional; -/** - */ // NOTE: This is a copy of TextureRegionTypeHandler that is to be used with UITextureRegions public class UITextureRegionTypeHandler extends StringRepresentationTypeHandler { private static final Logger logger = LoggerFactory.getLogger(UITextureRegionTypeHandler.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java index 4d9acc4be..6d1b01796 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java @@ -12,7 +12,7 @@ import org.terasology.reflection.TypeInfo; public class ComponentClassTypeHandlerFactory extends SpecificTypeHandlerFactory> { public ComponentClassTypeHandlerFactory() { - super(new TypeInfo>() {}); + super(new TypeInfo>() { }); } @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java index eecc257d7..54279b369 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java @@ -11,8 +11,6 @@ import org.terasology.persistence.typeHandling.PersistedDataMap; import java.nio.ByteBuffer; -/** - */ public abstract class AbstractGsonPersistedData implements PersistedData { private byte[] cachedDecodedBytes; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java index 25ed7a2a2..e03858d1a 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.ExclusionStrategy; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java index b80dcb4ba..f1236c003 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.JsonElement; -/** - */ public class GsonPersistedData extends AbstractGsonPersistedData { private final JsonElement element; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java index 2ea18adf9..1e1cbb292 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java @@ -19,8 +19,6 @@ import org.terasology.persistence.typeHandling.PersistedDataArray; import java.util.Iterator; import java.util.List; -/** - */ public class GsonPersistedDataArray extends AbstractGsonPersistedData implements PersistedDataArray { private JsonArray array; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java index 4212366ee..9d2738524 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java @@ -13,8 +13,6 @@ import java.util.AbstractMap; import java.util.Map; import java.util.Set; -/** - */ public class GsonPersistedDataMap extends AbstractGsonPersistedData implements PersistedDataMap { private JsonObject map; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java index 1143ddac7..68e2f3b21 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java index 64263ce78..c2f0c6c25 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java @@ -18,8 +18,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Map; -/** - */ public class GsonPersistedDataSerializer implements PersistedDataSerializer { private static final PersistedData NULL_INSTANCE = new GsonPersistedData(JsonNull.INSTANCE); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java index 2c4291847..e005e7164 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java index a26f45137..005b8904c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.Gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java index 644e8befa..aca72bc02 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java @@ -39,8 +39,8 @@ public class BlockAreaTypeHandler extends TypeHandler { PersistedDataArray sizedataArray = map.get(SIZE_FIELD).getAsArray(); TIntList sizeArr = sizedataArray.getAsIntegerArray(); return Optional.of( - new BlockArea(minArr.get(0), minArr.get(1)) - .setSize(sizeArr.get(0), sizeArr.get(1))); + new BlockArea(minArr.get(0), minArr.get(1)) + .setSize(sizeArr.get(0), sizeArr.get(1))); } PersistedDataArray maxDataArr = map.get(MAX_FIELD).getAsArray(); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java index 63091fd46..f6b9a35e2 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java @@ -40,8 +40,8 @@ public class BlockAreacTypeHandler extends TypeHandler { PersistedDataArray sizedataArray = map.get(SIZE_FIELD).getAsArray(); TIntList sizeArr = sizedataArray.getAsIntegerArray(); return Optional.of( - new BlockArea(minArr.get(0), minArr.get(1)) - .setSize(sizeArr.get(0), sizeArr.get(1))); + new BlockArea(minArr.get(0), minArr.get(1)) + .setSize(sizeArr.get(0), sizeArr.get(1))); } PersistedDataArray maxDataArr = map.get(MAX_FIELD).getAsArray(); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java index f7ef6ae3c..702d01138 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java @@ -11,8 +11,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class QuaternionfTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java index b9b29107c..ca1400c9b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java @@ -12,8 +12,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class Vector2fTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java index f78d99724..beb0f1fe0 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java @@ -11,8 +11,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class Vector2iTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java index 9025e90d9..b3f65278e 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java @@ -11,8 +11,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class Vector3fTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java index 4ae4d1890..66ef51e51 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java @@ -11,8 +11,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class Vector3iTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java index 2841156d7..94e05116b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java @@ -11,8 +11,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class Vector4fTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java index 1ffcda55b..8b50c6012 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.protobuf; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java index 8525e175b..fce337377 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.protobuf; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java index 358a6ba99..1c25140af 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java @@ -31,8 +31,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -/** - */ public class ProtobufPersistedData implements PersistedData, PersistedDataArray { private EntityData.Value data; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java index 3e8e4fbf8..3a2554b3f 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java @@ -15,8 +15,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Map; -/** - */ public class ProtobufPersistedDataSerializer implements PersistedDataSerializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java b/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java index 602e94981..f0399240b 100644 --- a/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java +++ b/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; -/** - */ public interface CollisionGroup { short getFlag(); diff --git a/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java b/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java index 02bbedea3..ed937ef5f 100644 --- a/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java +++ b/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; @@ -23,8 +10,6 @@ import java.util.Collections; import java.util.Locale; import java.util.Map; -/** - */ public class CollisionGroupManager { private Map collisionGroupMap = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/physics/HitResult.java b/engine/src/main/java/org/terasology/engine/physics/HitResult.java index a9f467eb0..445347727 100644 --- a/engine/src/main/java/org/terasology/engine/physics/HitResult.java +++ b/engine/src/main/java/org/terasology/engine/physics/HitResult.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; diff --git a/engine/src/main/java/org/terasology/engine/physics/Physics.java b/engine/src/main/java/org/terasology/engine/physics/Physics.java index f3a0e0684..ec6147e26 100644 --- a/engine/src/main/java/org/terasology/engine/physics/Physics.java +++ b/engine/src/main/java/org/terasology/engine/physics/Physics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; import org.terasology.joml.geom.AABBf; @@ -22,8 +9,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import java.util.List; import java.util.Set; -/** - */ public interface Physics { /** * Executes a rayTrace on the physics engine. diff --git a/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java b/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java index ef9b3c917..c4563b1ad 100644 --- a/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java +++ b/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; import java.util.Locale; -/** - */ public enum StandardCollisionGroup implements CollisionGroup { NONE((short) 0b00000000), DEFAULT((short) 0b00000001), diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java index 7625755a7..683ad940c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet; @@ -106,6 +106,14 @@ public class BulletPhysics implements PhysicsEngine { private final btGhostPairCallback ghostPairCallback; + /** + * Creates a Collider for the given entity based on the LocationComponent and CharacterMovementComponent. All + * collision flags are set right for a character movement component. + * + * @param owner the entity to create the collider for. + * @return + */ + private ArrayList shapes = Lists.newArrayList(); public BulletPhysics() { @@ -116,7 +124,8 @@ public class BulletPhysics implements PhysicsEngine { dispatcher = new btCollisionDispatcher(defaultCollisionConfiguration); sequentialImpulseConstraintSolver = new btSequentialImpulseConstraintSolver(); - discreteDynamicsWorld = new btDiscreteDynamicsWorld(dispatcher, broadphase, sequentialImpulseConstraintSolver, defaultCollisionConfiguration); + discreteDynamicsWorld = + new btDiscreteDynamicsWorld(dispatcher, broadphase, sequentialImpulseConstraintSolver, defaultCollisionConfiguration); discreteDynamicsWorld.setGravity(new Vector3f(0f, -PhysicsEngine.GRAVITY, 0f)); blockEntityRegistry = CoreRegistry.get(BlockEntityRegistry.class); @@ -124,11 +133,10 @@ public class BulletPhysics implements PhysicsEngine { } - public btDiscreteDynamicsWorld getWorld() { return discreteDynamicsWorld; } - //*****************Physics Interface methods******************\\ + //*****************Physics Interface methods******************\\ @Override public List getCollisionPairs() { @@ -142,8 +150,8 @@ public class BulletPhysics implements PhysicsEngine { this.discreteDynamicsWorld.dispose(); this.dispatcher.dispose(); this.defaultCollisionConfiguration.dispose(); - this.entityTriggers.forEach((k,v) -> v.dispose()); - this.entityRigidBodies.forEach((k,v)-> v.dispose()); + this.entityTriggers.forEach((k, v) -> v.dispose()); + this.entityRigidBodies.forEach((k, v) -> v.dispose()); this.ghostPairCallback.dispose(); } @@ -171,10 +179,12 @@ public class BulletPhysics implements PhysicsEngine { // TODO: Add the aabbTest method from newer versions of bullet to TeraBullet, use that instead - Vector3f extent = new Vector3f((area.maxX - area.minX) / 2.0f, (area.maxY - area.minY) / 2.0f, (area.maxZ - area.minZ) / 2.0f); + Vector3f extent = new Vector3f((area.maxX - area.minX) / 2.0f, (area.maxY - area.minY) / 2.0f, + (area.maxZ - area.minZ) / 2.0f); btBoxShape shape = new btBoxShape(extent); - btGhostObject scanObject = createCollider(new Vector3f(area.minX, area.minY, area.minZ).add(extent), shape, StandardCollisionGroup.SENSOR.getFlag(), - combineGroups(collisionFilter), btCollisionObject.CollisionFlags.CF_NO_CONTACT_RESPONSE); + btGhostObject scanObject = createCollider(new Vector3f(area.minX, area.minY, area.minZ).add(extent), shape, + StandardCollisionGroup.SENSOR.getFlag(), + combineGroups(collisionFilter), btCollisionObject.CollisionFlags.CF_NO_CONTACT_RESPONSE); // This in particular is overkill broadphase.calculateOverlappingPairs(dispatcher); @@ -239,8 +249,8 @@ public class BulletPhysics implements PhysicsEngine { callback.dispose(); if (collisionObject.userData instanceof EntityRef) { //we hit an other entity return new HitResult((EntityRef) collisionObject.userData, - hitPointWorld, - hitNormalWorld); + hitPointWorld, + hitNormalWorld); } else if ((collisionObject.getCollisionFlags() & btCollisionObject.CollisionFlags.CF_VOXEL_OBJECT) > 0) { btVector3i pos = new btVector3i(); collisionObject.getVoxelPosition(pos); @@ -248,9 +258,9 @@ public class BulletPhysics implements PhysicsEngine { Vector3i voxelPosition = new Vector3i(pos.getX(), pos.getY(), pos.getZ()); final EntityRef entityAt = blockEntityRegistry.getEntityAt(voxelPosition); return new HitResult(entityAt, - hitPointWorld, - hitNormalWorld, - voxelPosition); + hitPointWorld, + hitNormalWorld, + voxelPosition); } else { //we hit something we don't understand, assume its nothing and log a warning logger.warn("Unidentified object was hit in the physics engine: {}", collisionObject.userData); } @@ -374,7 +384,8 @@ public class BulletPhysics implements PhysicsEngine { public boolean updateTrigger(EntityRef entity) { LocationComponent location = entity.getComponent(LocationComponent.class); if (location == null) { - logger.warn("Trying to update or create trigger of entity that has no LocationComponent?! Entity: {}", entity); + logger.warn("Trying to update or create trigger of entity that has no LocationComponent?! Entity: {}", + entity); return false; } btPairCachingGhostObject triggerObj = entityTriggers.get(entity); @@ -477,7 +488,7 @@ public class BulletPhysics implements PhysicsEngine { btCollisionShape shape = getShapeFor(entity); if (shape != null && location != null && trigger != null) { float scale = location.getWorldScale(); - shape.setLocalScaling(new Vector3f(scale,scale,scale)); + shape.setLocalScaling(new Vector3f(scale, scale, scale)); List detectGroups = Lists.newArrayList(trigger.detectGroups); CollisionGroup collisionGroup = trigger.collisionGroup; btPairCachingGhostObject triggerObj = createCollider( @@ -503,31 +514,25 @@ public class BulletPhysics implements PhysicsEngine { } } - /** - * Creates a Collider for the given entity based on the LocationComponent - * and CharacterMovementComponent. - * All collision flags are set right for a character movement component. - * - * @param owner the entity to create the collider for. - * @return - */ - private ArrayList shapes = Lists.newArrayList(); private CharacterCollider createCharacterCollider(EntityRef owner) { LocationComponent locComp = owner.getComponent(LocationComponent.class); CharacterMovementComponent movementComp = owner.getComponent(CharacterMovementComponent.class); if (locComp == null || movementComp == null) { - throw new IllegalArgumentException("Expected an entity with a Location component and CharacterMovementComponent."); + throw new IllegalArgumentException("Expected an entity with a Location component and " + + "CharacterMovementComponent."); } Vector3f pos = locComp.getWorldPosition(new Vector3f()); final float worldScale = locComp.getWorldScale(); final float height = (movementComp.height - 2 * movementComp.radius) * worldScale; final float width = movementComp.radius * worldScale; - btConvexShape shape = new btCapsuleShape(width , height); + btConvexShape shape = new btCapsuleShape(width, height); shapes.add(shape); shape.setMargin(0.1f); - return createCustomCollider(pos, shape, movementComp.collisionGroup.getFlag(), combineGroups(movementComp.collidesWith), + return createCustomCollider(pos, shape, movementComp.collisionGroup.getFlag(), + combineGroups(movementComp.collidesWith), btCollisionObject.CollisionFlags.CF_CHARACTER_OBJECT, owner); } + private RigidBody newRigidBody(EntityRef entity) { LocationComponent location = entity.getComponent(LocationComponent.class); RigidBodyComponent rigidBody = entity.getComponent(RigidBodyComponent.class); @@ -537,13 +542,15 @@ public class BulletPhysics implements PhysicsEngine { shape.setLocalScaling(new Vector3f(scale, scale, scale)); if (rigidBody.mass < 1) { - logger.warn("RigidBodyComponent.mass is set to less than 1.0, this can lead to strange behaviour, such as the objects moving through walls. " + + logger.warn("RigidBodyComponent.mass is set to less than 1.0, this can lead to strange behaviour, " + + "such as the objects moving through walls. " + "Entity: {}", entity); } Vector3f inertia = new Vector3f(); - shape.calculateLocalInertia(rigidBody.mass,inertia); + shape.calculateLocalInertia(rigidBody.mass, inertia); - btRigidBody.btRigidBodyConstructionInfo info = new btRigidBody.btRigidBodyConstructionInfo(rigidBody.mass, new EntityMotionState(entity), shape, inertia); + btRigidBody.btRigidBodyConstructionInfo info = + new btRigidBody.btRigidBodyConstructionInfo(rigidBody.mass, new EntityMotionState(entity), shape, inertia); BulletRigidBody collider = new BulletRigidBody(info); collider.rb.userData = entity; collider.rb.setAngularFactor(rigidBody.angularFactor); @@ -551,7 +558,8 @@ public class BulletPhysics implements PhysicsEngine { collider.rb.setFriction(rigidBody.friction); collider.collidesWith = combineGroups(rigidBody.collidesWith); collider.setVelocity(rigidBody.velocity, rigidBody.angularVelocity); - collider.setTransform(location.getWorldPosition(new Vector3f()), location.getWorldRotation(new Quaternionf())); + collider.setTransform(location.getWorldPosition(new Vector3f()), + location.getWorldRotation(new Quaternionf())); updateKinematicSettings(rigidBody, collider); BulletRigidBody oldBody = entityRigidBodies.put(entity, collider); addRigidBody(collider, Lists.newArrayList(rigidBody.collisionGroup), rigidBody.collidesWith); @@ -560,7 +568,8 @@ public class BulletPhysics implements PhysicsEngine { } return collider; } else { - throw new IllegalArgumentException("Can only create a new rigid body for entities with a LocationComponent," + + throw new IllegalArgumentException("Can only create a new rigid body for entities with a " + + "LocationComponent," + " RigidBodyComponent and ShapeComponent, this entity misses at least one: " + entity); } } @@ -571,36 +580,35 @@ public class BulletPhysics implements PhysicsEngine { } /** - * Creates a new Collider. Colliders are similar to rigid bodies, except - * that they do not respond to forces from the physics engine. They collide - * with other objects and other objects may move if colliding with a - * collider, but the collider itself will only respond to movement orders - * from outside the physics engine. Colliders also detect any objects - * colliding with them. Allowing them to be used as sensors. + * Creates a new Collider. Colliders are similar to rigid bodies, except that they do not respond to forces from the + * physics engine. They collide with other objects and other objects may move if colliding with a collider, but the + * collider itself will only respond to movement orders from outside the physics engine. Colliders also detect any + * objects colliding with them. Allowing them to be used as sensors. * - * @param pos The initial position of the collider. - * @param shape The shape of this collider. + * @param pos The initial position of the collider. + * @param shape The shape of this collider. * @param groups * @param filters * @param collisionFlags - * @param entity The entity to associate this collider with. Can be null. + * @param entity The entity to associate this collider with. Can be null. * @return The newly created and added to the physics engine, Collider object. */ - private CharacterCollider createCustomCollider(Vector3f pos, btConvexShape shape, short groups, short filters, int collisionFlags, EntityRef entity) { + private CharacterCollider createCustomCollider(Vector3f pos, btConvexShape shape, short groups, short filters, + int collisionFlags, EntityRef entity) { if (entityColliders.containsKey(entity)) { entityColliders.remove(entity); } - final BulletCharacterMoverCollider bulletCollider = new BulletCharacterMoverCollider(pos, shape, groups, filters, collisionFlags, entity); + final BulletCharacterMoverCollider bulletCollider = new BulletCharacterMoverCollider(pos, shape, groups, + filters, collisionFlags, entity); entityColliders.put(entity, bulletCollider); return bulletCollider; } /** - * To make sure the state of the physics engine is constant, all changes are - * stored and executed at the same time. This method executes the stored - * additions and removals of bodies to and from the physics engine. It also - * ensures that impulses requested before the body is added to the engine - * are applied after the body is added to the engine. + * To make sure the state of the physics engine is constant, all changes are stored and executed at the same time. + * This method executes the stored additions and removals of bodies to and from the physics engine. It also ensures + * that impulses requested before the body is added to the engine are applied after the body is added to the + * engine. */ // TODO: None of the above is true. // TODO: This isn't necessary, create and remove bodies immediately @@ -611,7 +619,7 @@ public class BulletPhysics implements PhysicsEngine { } while (!removalQueue.isEmpty()) { BulletRigidBody body = removalQueue.poll(); - if(body.isDisposed) { + if (body.isDisposed) { continue; } discreteDynamicsWorld.removeRigidBody(body.rb); @@ -620,14 +628,13 @@ public class BulletPhysics implements PhysicsEngine { } /** - * Applies all pending impulses to the corresponding rigidBodies and clears - * the pending impulses. + * Applies all pending impulses to the corresponding rigidBodies and clears the pending impulses. */ private void applyPendingImpulsesAndForces() { for (Map.Entry entree : entityRigidBodies.entrySet()) { BulletRigidBody body = entree.getValue(); - if(body.pendingImpulse.lengthSquared() > .01f || body.pendingForce.lengthSquared() > .01f ) { + if (body.pendingImpulse.lengthSquared() > .01f || body.pendingForce.lengthSquared() > .01f) { body.rb.applyCentralImpulse(body.pendingImpulse); body.rb.applyCentralForce(body.pendingForce); } @@ -642,9 +649,12 @@ public class BulletPhysics implements PhysicsEngine { } private void addRigidBody(BulletRigidBody body) { - - short filter = (short) (btBroadphaseProxy.CollisionFilterGroups.DefaultFilter | btBroadphaseProxy.CollisionFilterGroups.StaticFilter| btBroadphaseProxy.CollisionFilterGroups.SensorTrigger); - insertionQueue.add(new RigidBodyRequest(body, (short) btBroadphaseProxy.CollisionFilterGroups.DefaultFilter, filter)); + short filter = + (short) (btBroadphaseProxy.CollisionFilterGroups.DefaultFilter + | btBroadphaseProxy.CollisionFilterGroups.StaticFilter + | btBroadphaseProxy.CollisionFilterGroups.SensorTrigger); + insertionQueue.add(new RigidBodyRequest(body, (short) btBroadphaseProxy.CollisionFilterGroups.DefaultFilter, + filter)); } private void addRigidBody(BulletRigidBody body, List groups, List filter) { @@ -652,7 +662,8 @@ public class BulletPhysics implements PhysicsEngine { } private void addRigidBody(BulletRigidBody body, short groups, short filter) { - insertionQueue.add(new RigidBodyRequest(body, groups, (short) (filter | btBroadphaseProxy.CollisionFilterGroups.SensorTrigger))); + insertionQueue.add(new RigidBodyRequest(body, groups, + (short) (filter | btBroadphaseProxy.CollisionFilterGroups.SensorTrigger))); } private void removeRigidBody(BulletRigidBody body) { @@ -660,11 +671,9 @@ public class BulletPhysics implements PhysicsEngine { } /** - * Returns the shape belonging to the given entity. It currently knows 4 - * different shapes: Sphere, Capsule, Cylinder or arbitrary. - * The shape is determined based on the shape component of the given entity. - * If the entity has somehow got multiple shapes, only one is picked. The - * order of priority is: Sphere, Capsule, Cylinder, arbitrary. + * Returns the shape belonging to the given entity. It currently knows 4 different shapes: Sphere, Capsule, Cylinder + * or arbitrary. The shape is determined based on the shape component of the given entity. If the entity has somehow + * got multiple shapes, only one is picked. The order of priority is: Sphere, Capsule, Cylinder, arbitrary. *

* TODO: Flyweight this (take scale as parameter) * @@ -703,14 +712,15 @@ public class BulletPhysics implements PhysicsEngine { return new btConvexHullShape(buffer, numPoints, 3 * Float.BYTES); } CharacterMovementComponent characterMovementComponent = - entityRef.getComponent(CharacterMovementComponent.class); + entityRef.getComponent(CharacterMovementComponent.class); if (characterMovementComponent != null) { - return new btCapsuleShape(characterMovementComponent.pickupRadius, characterMovementComponent.height - 2 * characterMovementComponent.radius); + return new btCapsuleShape(characterMovementComponent.pickupRadius, + characterMovementComponent.height - 2 * characterMovementComponent.radius); } logger.error("Creating physics object that requires a ShapeComponent or CharacterMovementComponent, but has " + - "neither. Entity: {}", entityRef); + "neither. Entity: {}", entityRef); throw new IllegalArgumentException("Creating physics object that requires a ShapeComponent or " + - "CharacterMovementComponent, but has neither. Entity: " + entityRef); + "CharacterMovementComponent, but has neither. Entity: " + entityRef); } private void updateKinematicSettings(RigidBodyComponent rigidBody, BulletRigidBody collider) { @@ -725,7 +735,7 @@ public class BulletPhysics implements PhysicsEngine { private btPairCachingGhostObject createCollider(Vector3f pos, btCollisionShape shape, short groups, short filters, int collisionFlags) { - Matrix4f startTransform = new Matrix4f().translation(pos); + Matrix4f startTransform = new Matrix4f().translation(pos); btPairCachingGhostObject result = new btPairCachingGhostObject(); result.setWorldTransform(startTransform); @@ -790,10 +800,10 @@ public class BulletPhysics implements PhysicsEngine { manifoldPoint.getNormalWorldOnB(a3); collisionPairs.add(new PhysicsSystem.CollisionPair(entity, otherEntity, - a1, - a2, - manifoldPoint.getDistance(), - a3)); + a1, + a2, + manifoldPoint.getDistance(), + a3)); break; } } @@ -878,12 +888,14 @@ public class BulletPhysics implements PhysicsEngine { @Override public Vector3f getLinearVelocity(Vector3f out) { + //TODO: set value on `out` vector return rb.getLinearVelocity(); } @Override public Vector3f getAngularVelocity(Vector3f out) { - return rb.getAngularVelocity();// out; + //TODO: set value on `out` vector + return rb.getAngularVelocity(); } @Override @@ -901,7 +913,8 @@ public class BulletPhysics implements PhysicsEngine { @Override public void setOrientation(Quaternionf orientation) { Matrix4f transform = rb.getWorldTransform(); - rb.setWorldTransform(new Matrix4f().translationRotateScale(transform.getTranslation(new Vector3f()), orientation, 1.0f)); + rb.setWorldTransform(new Matrix4f().translationRotateScale(transform.getTranslation(new Vector3f()), + orientation, 1.0f)); } @Override @@ -943,7 +956,7 @@ public class BulletPhysics implements PhysicsEngine { } } - private final class BulletCharacterMoverCollider implements CharacterCollider { + private final class BulletCharacterMoverCollider implements CharacterCollider { boolean pending = true; //private final Transform temp = new Transform(); @@ -954,16 +967,19 @@ public class BulletPhysics implements PhysicsEngine { //is allowed to gain direct access to the bullet body: private final btPairCachingGhostObject collider; - private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, List filters, EntityRef owner) { + private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, + List filters, EntityRef owner) { this(pos, shape, groups, filters, 0, owner); } - private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, List filters, int collisionFlags, EntityRef owner) { + private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, + List filters, int collisionFlags, EntityRef owner) { this(pos, shape, combineGroups(groups), combineGroups(filters), collisionFlags, owner); } - private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, short groups, short filters, int collisionFlags, EntityRef owner) { + private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, short groups, short filters, + int collisionFlags, EntityRef owner) { collider = createCollider(pos, shape, groups, filters, collisionFlags); collider.userData = owner; } @@ -981,7 +997,7 @@ public class BulletPhysics implements PhysicsEngine { @Override public void setLocation(Vector3f loc) { - Matrix4f matrix = collider.getWorldTransform(); + Matrix4f matrix = collider.getWorldTransform(); matrix.setTranslation(loc); collider.setWorldTransform(matrix); } @@ -993,8 +1009,9 @@ public class BulletPhysics implements PhysicsEngine { BulletSweepCallback callback = new BulletSweepCallback(collider, startPos, slopeFactor); callback.setCollisionFilterGroup(collider.getBroadphaseHandle().getCollisionFilterGroup()); callback.setCollisionFilterMask(collider.getBroadphaseHandle().getCollisionFilterMask()); - callback.setCollisionFilterGroup((short)(callback.getCollisionFilterGroup() & (~StandardCollisionGroup.SENSOR.getFlag()))); - collider.convexSweepTest((btConvexShape)(collider.getCollisionShape()), startTransform, endTransform, callback, allowedPenetration); + callback.setCollisionFilterGroup((short) (callback.getCollisionFilterGroup() & (~StandardCollisionGroup.SENSOR.getFlag()))); + collider.convexSweepTest((btConvexShape) (collider.getCollisionShape()), startTransform, endTransform, + callback, allowedPenetration); return callback; } } diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java index 7e5be952b..4d97daadd 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet; @@ -131,7 +118,8 @@ public class BulletSweepCallback extends ClosestConvexResultCallback implements Matrix4f transformFrom = new Matrix4f().setTranslation(fromWorld); Matrix4f transformTo = new Matrix4f().setTranslation(toWorld); Matrix4f targetTransform = this.getHitCollisionObject().getWorldTransform(); - btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); + btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), + this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); if (rayResult.hasHit()) { hitStep = true; Vector3f hitNormal = new Vector3f(); @@ -144,7 +132,8 @@ public class BulletSweepCallback extends ClosestConvexResultCallback implements transformFrom = new Matrix4f().setTranslation(fromWorld); transformTo = new Matrix4f().setTranslation(toWorld); targetTransform = this.getHitCollisionObject().getWorldTransform(); - btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); + btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), + this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); if (rayResult.hasHit()) { hitStep = true; Vector3f hitNormal = new Vector3f(); diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java b/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java index e233b0c34..976a4458c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java index e9eede4af..f8b2d495b 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btBoxShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java index c84282bfd..5bc795df7 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java index a8c5b36fc..9d8603ca1 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java index 33c0c425d..45bf5e81d 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btCollisionShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java index f13f7b683..84c3b757e 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btConvexHullShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java index d139bfb45..176af2ec2 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btCylinderShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java index eedf6078c..7f129a2e1 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btSphereShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java index 9d4f953e7..76efd9331 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components; @@ -27,8 +14,6 @@ import org.terasology.engine.world.block.ForceBlockActive; import java.util.List; -/** - */ @ForceBlockActive public class RigidBodyComponent implements Component { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java index ded29efb1..4d4e73ac8 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components; @@ -25,8 +12,6 @@ import org.terasology.engine.world.block.ForceBlockActive; import java.util.List; -/** - */ @ForceBlockActive public class TriggerComponent implements Component { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/physics/components/package-info.java b/engine/src/main/java/org/terasology/engine/physics/components/package-info.java index 6243f441a..3b1fbd9be 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.components; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java index 8490a04d3..54c72b960 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; @@ -20,8 +7,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; -/** - */ public class BoxShapeComponent implements Component { @Replicate public Vector3f extents = new Vector3f(1, 1, 1); diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java index db2394000..cc26c3844 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; -/** - */ public class CapsuleShapeComponent implements Component { public float radius = 0.5f; public float height = 1.0f; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java index cd6a5edc1..d91b077e4 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; -/** - */ public class CylinderShapeComponent implements Component { public float radius = 0.5f; public float height = 1.0f; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java index ca438a354..43e440c51 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java @@ -1,26 +1,11 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.rendering.assets.mesh.Mesh; -/** - */ public class HullShapeComponent implements Component { public Mesh sourceMesh; } diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java index 9e1e143f9..ebdb3bd0c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; -/** - */ public class SphereShapeComponent implements Component { public float radius = 0.5f; } diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java index d6441987f..5cef5b6c0 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.components.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java b/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java index 8b9fb907e..9e3964c82 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java index ae4fbe9a5..4936359a4 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java index 0f5bb9597..6d7dd82f2 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java index 079a4dc73..735f02598 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java b/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java index 1c078d29a..f67de1245 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java b/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java index c905bb4a0..44c41cc28 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java index bae7312cd..99116b631 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java index 997fda658..fffb9c53b 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class ChangeVelocityEvent implements Event { private Vector3f linearVelocity; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java index 6b059a56f..17182d589 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java index 3d91b43b0..6cb571b4a 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java index 6c23a1696..7363f58da 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class ForceEvent implements Event { private Vector3f force; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java index dcb191022..51ac93e00 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java index ac764d99c..63e697987 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class ImpulseEvent implements Event { private Vector3f impulse; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java index 33b841b41..c4183a0af 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java index adc4c2bdd..6603b819d 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class PhysicsResynchEvent implements Event { private Vector3f velocity = new Vector3f(); diff --git a/engine/src/main/java/org/terasology/engine/physics/events/package-info.java b/engine/src/main/java/org/terasology/engine/physics/events/package-info.java index b698739d0..69557910a 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/package-info.java b/engine/src/main/java/org/terasology/engine/physics/package-info.java index 6f720b194..3d2b11662 100644 --- a/engine/src/main/java/org/terasology/engine/physics/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 /** * This package provides physics support for Terasology - diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java index 827d30f22..b75f53e2c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java index 1e29c4c3d..4601bc363 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; import org.terasology.joml.geom.AABBf; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java index e3248aed3..7a1de661a 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java index 014d18c30..70040e90e 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; import org.joml.Quaternionfc; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java index 6b1851945..718495e1c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java index 417553e2b..02b95ef57 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; /** diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java index 1ec592392..dbfde465b 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.shapes; diff --git a/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java b/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java index 9e57e3d31..46a7c74c4 100644 --- a/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java +++ b/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java index ed763e203..bab7a16de 100644 --- a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java +++ b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; diff --git a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java index 7b2b554f7..9f59e53df 100644 --- a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java +++ b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import java.util.ArrayList; diff --git a/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java b/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java index c1790bafa..8d767a6f2 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/recording/EventCopier.java b/engine/src/main/java/org/terasology/engine/recording/EventCopier.java index d32c789d9..d7e8610d6 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventCopier.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventCopier.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java b/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java index 8fc3f7b5f..33e39242d 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java @@ -328,8 +328,9 @@ public class EventSystemReplayImpl implements EventSystem { componentParams.add((Class) types[i]); } - EventSystemReplayImpl.ByteCodeEventHandlerInfo handlerInfo = new EventSystemReplayImpl.ByteCodeEventHandlerInfo(handler, method, receiveEventAnnotation.priority(), - receiveEventAnnotation.activity(), requiredComponents, componentParams); + EventSystemReplayImpl.ByteCodeEventHandlerInfo handlerInfo = + new EventSystemReplayImpl.ByteCodeEventHandlerInfo(handler, method, receiveEventAnnotation.priority(), + receiveEventAnnotation.activity(), requiredComponents, componentParams); addEventHandler((Class) types[0], handlerInfo, requiredComponents); } } diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java index b9a53a9bc..b6b52f5d5 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; /** diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java index 0bc82aee7..d182d028d 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; /** diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java index 9f1b59762..5519a8a6f 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; /** diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java index 5aa4a8a12..0c9534347 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java index b39a28bcc..490ccdafd 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java index 4feb6f806..9137f0002 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java @@ -71,7 +71,7 @@ class RecordedEventSerializer { try (FileInputStream fileInputStream = new FileInputStream(filePath)) { List recordedEvents = - serializer.deserialize(new TypeInfo>() {}, fileInputStream).get(); + serializer.deserialize(new TypeInfo>() { }, fileInputStream).get(); events.addAll(recordedEvents); } catch (SerializationException | IOException e) { logger.error("Error while serializing recorded events", e); diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java index d539f4464..be224686b 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import java.util.ArrayList; diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java b/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java index 290872091..a90a97706 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; diff --git a/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java b/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java index 0ebb53b32..becf2bcc6 100644 --- a/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java +++ b/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java @@ -24,8 +24,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -/** - */ public class ByteCodeReflectFactory implements ReflectFactory { private static final Logger logger = LoggerFactory.getLogger(ByteCodeReflectFactory.class); diff --git a/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java b/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java index 77555b8a4..4cc4cedd7 100644 --- a/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java +++ b/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/registry/In.java b/engine/src/main/java/org/terasology/engine/registry/In.java index 0a958eb82..23297581a 100644 --- a/engine/src/main/java/org/terasology/engine/registry/In.java +++ b/engine/src/main/java/org/terasology/engine/registry/In.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; diff --git a/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java b/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java index f79d7abcc..4715e9a3c 100644 --- a/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java +++ b/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java @@ -17,8 +17,6 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Optional; -/** - */ public final class InjectionHelper { private static final Logger logger = LoggerFactory.getLogger(InjectionHelper.class); diff --git a/engine/src/main/java/org/terasology/engine/registry/Share.java b/engine/src/main/java/org/terasology/engine/registry/Share.java index e2cf5aba8..fe32b0d51 100644 --- a/engine/src/main/java/org/terasology/engine/registry/Share.java +++ b/engine/src/main/java/org/terasology/engine/registry/Share.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; diff --git a/engine/src/main/java/org/terasology/engine/registry/package-info.java b/engine/src/main/java/org/terasology/engine/registry/package-info.java index f2df01300..78935b3b4 100644 --- a/engine/src/main/java/org/terasology/engine/registry/package-info.java +++ b/engine/src/main/java/org/terasology/engine/registry/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.registry; diff --git a/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java index 7e32dde4d..7c51ebb17 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering; import org.terasology.joml.geom.AABBfc; -/** - */ public interface BlockOverlayRenderer { void setAABB(AABBfc aabb); diff --git a/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java b/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java index 4c932737c..81dc0ca5d 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java +++ b/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java @@ -6,8 +6,6 @@ import org.joml.Vector2f; import org.joml.Vector3fc; import org.terasology.engine.rendering.dag.nodes.RefractiveReflectiveBlocksNodeProxy; -/** - */ public final class RenderHelper { // Parameters which are also defined on shader side diff --git a/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java b/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java index dae913267..8408ec019 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java +++ b/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering; import org.terasology.math.TeraMath; -/** - */ public final class RenderMath { private RenderMath() { } diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java index 7c1eb9947..5bbdfe7f6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java @@ -9,8 +9,6 @@ import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.rendering.assets.skeletalmesh.SkeletalMesh; import org.terasology.joml.geom.AABBf; -/** - */ public abstract class MeshAnimation extends Asset { protected MeshAnimation(ResourceUrn urn, AssetType assetType) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java index 145808718..38573d71e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java @@ -10,8 +10,6 @@ import org.terasology.joml.geom.AABBf; import java.util.List; -/** - */ public class MeshAnimationData implements AssetData { public static final int NO_PARENT = -1; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java index 7e9673ae5..27daa206b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java @@ -9,8 +9,6 @@ import org.joml.Vector3f; import java.util.List; -/** - */ public class MeshAnimationFrame { private List bonePositions; private List boneRotations; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java index d132a7a30..9783c994a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java @@ -11,8 +11,6 @@ import org.terasology.joml.geom.AABBf; import java.util.Optional; -/** - */ public class MeshAnimationImpl extends MeshAnimation { private MeshAnimationData data; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java index ef962eee7..109e29e8f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java @@ -12,8 +12,6 @@ import java.util.Collections; import java.util.Optional; import java.util.Set; -/** - */ @RegisterAssetDataProducer public class AltasTileProducer extends AbstractFragmentDataProducer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java index b0ffa85dd..272e58786 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java @@ -12,8 +12,6 @@ import org.terasology.gestalt.naming.Name; import java.util.Map; import java.util.Optional; -/** - */ public class Atlas extends Asset { private Map subtextures = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java index 14c2c9ab9..606c85eb9 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java @@ -8,8 +8,6 @@ import org.terasology.gestalt.naming.Name; import java.util.Map; -/** - */ public class AtlasData implements AssetData { private Map subtextures; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java index 1ca496060..90941eace 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java @@ -6,8 +6,6 @@ import org.joml.Vector2i; import java.util.List; -/** - */ public class AtlasDefinition { private String texture; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java index 2e0990e80..867af9790 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java @@ -29,8 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -/** - */ @RegisterAssetFileFormat public class AtlasFormat extends AbstractAssetFileFormat { public static final float BORDER_SIZE = 0.0001f; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java index 3db6d0a14..c8232a6a4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering.assets.atlas; import org.joml.Vector2i; -/** - */ public class FreeformDefinition { private String name; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java index 0ac72a25c..d651a42d7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java @@ -7,8 +7,6 @@ import org.joml.Vector2i; import java.util.List; -/** - */ public class GridDefinition { private Vector2i tileSize; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java index 297bacbb1..3ffaddd12 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java @@ -10,8 +10,6 @@ import org.terasology.gestalt.assets.ResourceUrn; import java.util.List; -/** - */ public abstract class Font extends Asset implements org.terasology.nui.asset.font.Font { protected Font(ResourceUrn urn, AssetType assetType) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java index 60ad26bd0..9ae9222b4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java @@ -6,8 +6,6 @@ package org.terasology.engine.rendering.assets.font; import org.terasology.engine.rendering.assets.material.Material; import org.terasology.engine.rendering.assets.texture.Texture; -/** - */ public class FontCharacter { private float x; private float y; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java index 6a78048bd..17fe0b982 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java @@ -7,8 +7,6 @@ import org.terasology.gestalt.assets.AssetData; import java.util.Map; -/** - */ public class FontData implements AssetData { private int lineHeight; private int baseHeight; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java index efd564057..964692822 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java @@ -10,8 +10,6 @@ import org.terasology.engine.rendering.assets.texture.Texture; import java.util.Map; -/** - */ public class FontDataBuilder { private int lineHeight; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java index 731fcc667..d202d7539 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java @@ -21,8 +21,6 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -/** - */ @RegisterAssetFileFormat public class FontFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java index dd69808a2..b975ff26d 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.Optional; import java.util.Set; -/** - */ @RegisterAssetDataProducer public class FontMaterialProducer implements AssetDataProducer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java index 4de5e88b4..51acb7fae 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java @@ -18,8 +18,6 @@ import org.terasology.gestalt.assets.ResourceUrn; import java.nio.FloatBuffer; -/** - */ public abstract class Material extends Asset { protected Material(ResourceUrn urn, AssetType assetType, DisposableResource resource) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java index b142e2227..e3b3def3c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java @@ -11,8 +11,6 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkNotNull; -/** - */ public class MaterialData implements AssetData { private Shader shader; private Map textures = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java index 301590127..c108397f3 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java @@ -28,8 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -/** - */ @RegisterAssetFileFormat public class MaterialFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java index e5775e14d..e9deff83b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java @@ -14,8 +14,6 @@ import org.terasology.engine.rendering.assets.mesh.layout.Layout; import java.util.ArrayList; import java.util.List; -/** - */ public abstract class MeshData implements AssetData { public enum DrawingMode { POINTS(GL30.GL_POINT), diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java index 95482f4b2..a485447b9 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java @@ -23,12 +23,9 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.lang.reflect.Type; -import java.nio.file.PathMatcher; import java.util.List; import java.util.function.Predicate; -/** - */ @RegisterAssetFileFormat public class GLSLShaderFormat implements AssetFileFormat { public static final String FRAGMENT_SUFFIX = "_frag.glsl"; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java index 26f526193..33e5f614c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java @@ -8,8 +8,6 @@ import org.terasology.gestalt.assets.AssetType; import org.terasology.gestalt.assets.DisposableResource; import org.terasology.gestalt.assets.ResourceUrn; -/** - */ public abstract class Shader extends Asset { protected Shader(ResourceUrn urn, AssetType assetType, DisposableResource resource) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java index 4e76d95d3..4d8c9d4a5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -/** - */ public class ShaderData implements AssetData { private static final String DEFAULT_VERSION = "120"; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java index 6e827b7a1..056595dac 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java @@ -7,8 +7,6 @@ import com.google.common.collect.Lists; import java.util.List; -/** - */ public class ShaderMetadata { List parameters = Lists.newArrayList(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java index 05fd5492a..17595c687 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java @@ -3,8 +3,6 @@ package org.terasology.engine.rendering.assets.shader; -/** - */ public class ShaderParameterMetadata { String name; ParamType type; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java index d90e7c014..0167be7ad 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java @@ -11,8 +11,6 @@ import org.joml.Vector3f; import java.util.Collection; import java.util.List; -/** - */ public class Bone { private String name; private int index; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java index 17ae4fe11..ba1f1196c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java @@ -7,8 +7,6 @@ import com.google.common.base.Preconditions; import gnu.trove.list.TFloatList; import gnu.trove.list.TIntList; -/** - */ public class BoneWeight { private float[] biases; private int[] boneIndices; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java index 61cbce3fb..9a742530f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java @@ -11,8 +11,6 @@ import org.terasology.joml.geom.AABBf; import java.util.Collection; -/** - */ public abstract class SkeletalMesh extends Asset { protected SkeletalMesh(ResourceUrn urn, AssetType assetType, DisposableResource disposableResource) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java index 2059235d7..f8dbb2c74 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java @@ -18,9 +18,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -/** - * - */ + public class SkeletalMeshData implements AssetData { private Bone rootBone; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java index 01cb7a617..88127b9c0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java @@ -10,14 +10,11 @@ import org.joml.Vector3f; import org.terasology.engine.rendering.assets.mesh.StandardMeshData; import org.terasology.joml.geom.AABBf; import org.terasology.engine.rendering.assets.mesh.MeshBuilder; -import org.terasology.engine.rendering.assets.mesh.MeshData; import java.util.ArrayList; import java.util.List; -/** - * - */ + public class SkeletalMeshDataBuilder { private List bones = new ArrayList<>(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java index 9b32a7011..4e59beda5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java @@ -22,8 +22,6 @@ import java.util.function.Predicate; import static org.terasology.gestalt.assets.module.ModuleAssetScanner.OVERRIDE_FOLDER; -/** - */ @RegisterAssetFileFormat public class AWTTextureFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java index 1b7e792f2..7a6ae33f7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java @@ -9,8 +9,6 @@ import org.terasology.joml.geom.Rectanglef; import org.terasology.joml.geom.Rectanglei; import org.terasology.math.TeraMath; -/** - */ public class BasicTextureRegion implements TextureRegion { private Texture texture; private Rectanglef region = new Rectanglef(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java index e2a11ba55..c34d079c0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java @@ -12,12 +12,9 @@ import org.terasology.gestalt.module.resources.FileReference; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; -import java.nio.file.PathMatcher; import java.util.List; import java.util.function.Predicate; -/** - */ public class PNGTextureFormat extends AbstractAssetFileFormat { private Texture.FilterMode defaultFilterMode; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java index 42f2f1760..d7516da9d 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java @@ -8,8 +8,6 @@ import org.terasology.gestalt.assets.AssetData; import java.nio.ByteBuffer; import java.util.Arrays; -/** - */ public class TextureData implements AssetData { private static final int BYTES_PER_PIXEL = 4; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java index 0dc89dacf..2d586758e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java @@ -13,8 +13,6 @@ import org.terasology.gestalt.assets.module.annotations.RegisterAssetSupplementa import java.io.IOException; import java.io.InputStreamReader; -/** - */ @RegisterAssetSupplementalFileFormat public class TextureInfoFormat extends AbstractAssetAlterationFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java index da77ad32c..ab9588f27 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java @@ -8,8 +8,6 @@ import org.terasology.gestalt.assets.AssetType; import org.terasology.gestalt.assets.DisposableResource; import org.terasology.gestalt.assets.ResourceUrn; -/** - */ public abstract class TextureRegionAsset extends Asset implements TextureRegion { protected TextureRegionAsset(ResourceUrn urn, AssetType assetType) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java index ef21f5266..35ac62198 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java @@ -15,8 +15,6 @@ import org.terasology.engine.rendering.assets.texture.TextureRegionAsset; import java.util.Optional; -/** - */ public class Subtexture extends TextureRegionAsset { private Texture texture; @@ -58,7 +56,7 @@ public class Subtexture extends TextureRegionAsset { public Rectanglei getPixelRegion() { return new Rectanglei( TeraMath.floorToInt(subregion.minX() * texture.getWidth()), - TeraMath.floorToInt(subregion.minY() * texture.getHeight())).setSize( getWidth(), getHeight()); + TeraMath.floorToInt(subregion.minY() * texture.getHeight())).setSize(getWidth(), getHeight()); } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java index 9f49e5644..92441da9b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java @@ -6,8 +6,6 @@ import org.terasology.gestalt.assets.AssetData; import org.terasology.joml.geom.Rectanglef; import org.terasology.engine.rendering.assets.texture.Texture; -/** - */ public class SubtextureData implements AssetData { private Texture texture; private Rectanglef region; diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java b/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java index db018f585..01b50529b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java @@ -205,14 +205,15 @@ public abstract class AbstractNode implements Node { logger.debug("data propagated.\n"); } - if(localBufferPairConnection.getData() != null) { + if (localBufferPairConnection.getData() != null) { logger.warn("Adding output buffer pair to slot id " + id + " of " + this.nodeUri + "node overwrites data of existing connection: " + localBufferPairConnection.toString()); } localBufferPairConnection.setData(bufferPair); success = true; } else { - DependencyConnection localBufferPairConnection = new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, bufferPair, this.getUri()); + DependencyConnection localBufferPairConnection = + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, bufferPair, this.getUri()); success = addOutputConnection(localBufferPairConnection); } return success; @@ -240,7 +241,7 @@ public abstract class AbstractNode implements Node { logger.info("data propagated.\n"); } - if(localBufferPairConnection.getData() != null) { + if (localBufferPairConnection.getData() != null) { logger.warn("Adding output buffer pair connection " + from.toString() + "\n to slot id " + id + " of " + this.nodeUri + "node overwrites data of existing connection: " + localBufferPairConnection.toString()); } @@ -248,14 +249,16 @@ public abstract class AbstractNode implements Node { success = true; } else { - DependencyConnection localBufferPairConnection = new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, from.getData(), this.getUri()); + DependencyConnection localBufferPairConnection = + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, from.getData(), this.getUri()); success = addOutputConnection(localBufferPairConnection); } return success; } public boolean addOutputBufferPairConnection(int id) { - DependencyConnection localBufferPairConnection = new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); + DependencyConnection localBufferPairConnection = + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); return addOutputConnection(localBufferPairConnection); } @@ -266,7 +269,8 @@ public abstract class AbstractNode implements Node { * @return true if inserted, false otherwise */ protected boolean addInputFboConnection(int id, FboConnection from) { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, from.getData(), this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, from.getData(), this.getUri()); fboConnection.setConnectedConnection(from); // must remember where I'm connected from return addInputConnection(fboConnection); } @@ -278,7 +282,8 @@ public abstract class AbstractNode implements Node { * @return true if inserted, false otherwise */ public boolean addInputFboConnection(int id, FBO fboData) { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, fboData, this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, fboData, this.getUri()); return addInputConnection(fboConnection); } @@ -294,7 +299,7 @@ public abstract class AbstractNode implements Node { if (outputConnections.containsKey(connectionUri)) { FboConnection fboConnection = (FboConnection) outputConnections.get(connectionUri); - if(fboConnection.getData() != null) { + if (fboConnection.getData() != null) { logger.warn("Adding output fbo data to slot id " + id + " of " + this.nodeUri + "node overwrites data of existing connection: " + fboConnection.toString()); } @@ -312,14 +317,16 @@ public abstract class AbstractNode implements Node { success = true; } else { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, fboData, this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, fboData, this.getUri()); success = addOutputConnection(fboConnection); } return success; } public boolean addOutputFboConnection(int id) { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); return addOutputConnection(fboConnection); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java index f675e73cf..c41558a24 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java @@ -6,9 +6,7 @@ import org.terasology.engine.core.SimpleUri; // TODO examine if we really need this connection type -/** - * - */ + public class RunOrderConnection extends DependencyConnection { public RunOrderConnection(String name, Type type, SimpleUri parentNode) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java index d7b90fbeb..50c56b85e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java @@ -3,18 +3,18 @@ package org.terasology.engine.rendering.dag.stateChanges; import com.google.common.base.Objects; -import org.terasology.engine.rendering.opengl.FBO; import org.terasology.engine.rendering.dag.StateChange; +import org.terasology.engine.rendering.opengl.FBO; /** * Sets an FBO's write mask. - * + *

* A write mask is useful to render to an FBO leaving some of its attachments untouched. - * + *

* This particular state change independently enables/disables writing to the color, depth and light accumulation - * attachments of an FBO. At this stage this functionality makes sense only in the context of the gBuffers, - * as only those buffers have all the attachments mentioned. - * + * attachments of an FBO. At this stage this functionality makes sense only in the context of the gBuffers, as only + * those buffers have all the attachments mentioned. + *

* The behaviour of this state change in relation to FBOs that do not have all the relevant attachments has not been * investigated. */ @@ -29,16 +29,19 @@ public final class SetFboWriteMask implements StateChange { /** * Creates an instance of this StateChange, that can be added to a Node's list of desired StateChanges. - * - * Sample use: - * addDesiredStateChange(new SetFboWriteMask(fbo, true, false, false)); + *

+ * Sample use: addDesiredStateChange(new SetFboWriteMask(fbo, true, false, false)); * * @param fbo The FBO whose render masks have to be modified - usually only the lastUpdatedGBuffer. - * @param renderToColorBuffer A boolean indicating whether the Color buffer of the given FBO should be written to. - * @param renderToDepthBuffer A boolean indicating whether the DepthStencil buffer of the given FBO should be written to. - * @param renderToLightBuffer A boolean indicating whether the Light Accumulation buffer of the given FBO should be written to. + * @param renderToColorBuffer A boolean indicating whether the Color buffer of the given FBO should be + * written to. + * @param renderToDepthBuffer A boolean indicating whether the DepthStencil buffer of the given FBO should + * be written to. + * @param renderToLightBuffer A boolean indicating whether the Light Accumulation buffer of the given FBO + * should be written to. */ - public SetFboWriteMask(FBO fbo, boolean renderToColorBuffer, boolean renderToDepthBuffer, boolean renderToLightBuffer) { + public SetFboWriteMask(FBO fbo, boolean renderToColorBuffer, boolean renderToDepthBuffer, + boolean renderToLightBuffer) { this.fbo = fbo; this.renderToColorBuffer = renderToColorBuffer; this.renderToDepthBuffer = renderToDepthBuffer; @@ -83,7 +86,8 @@ public final class SetFboWriteMask implements StateChange { @Override public String toString() { - return String.format("%30s: %s (fboId: %s), %b, %b, %b", this.getClass().getSimpleName(), fbo.getName(), fbo.getId(), renderToColorBuffer, renderToDepthBuffer, renderToLightBuffer); + return String.format("%30s: %s (fboId: %s), %b, %b, %b", this.getClass().getSimpleName(), fbo.getName(), + fbo.getId(), renderToColorBuffer, renderToDepthBuffer, renderToLightBuffer); } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetInputTexture.java b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetInputTexture.java index 212fc86ad..6d471ab9f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetInputTexture.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetInputTexture.java @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.dag.stateChanges; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.rendering.assets.material.Material; import org.terasology.engine.rendering.assets.texture.Texture; import org.terasology.engine.rendering.dag.StateChange; import org.terasology.engine.utilities.Assets; +import org.terasology.gestalt.assets.ResourceUrn; import java.util.Objects; import java.util.Optional; @@ -16,21 +16,23 @@ import static org.lwjgl.opengl.GL13.GL_TEXTURE0; import static org.lwjgl.opengl.GL13.glActiveTexture; import static org.terasology.engine.rendering.dag.AbstractNode.getMaterial; -// TODO: split this class into two - one for opengl's global state change and one for the specific material state change. +// TODO: split this class into two - one for opengl's global state change and one for the specific material state +// change. /** * Sets a texture asset as the input for a material. - * - * Input textures are assigned to a texture unit and this is then communicated to the shader. - * This StateChange and the underlying task only handles textures of type GL_TEXTURE_2D. - * - * Instances of this class bind a texture to a texture unit. The integer identifying the texture unit is then - * passed to a shader program using the material/parameter pair provided on construction. This allow for a - * texture asset to be used by a shader program as an input. - * + *

+ * Input textures are assigned to a texture unit and this is then communicated to the shader. This StateChange and the + * underlying task only handles textures of type GL_TEXTURE_2D. + *

+ * Instances of this class bind a texture to a texture unit. The integer identifying the texture unit is then passed to + * a shader program using the material/parameter pair provided on construction. This allow for a texture asset to be + * used by a shader program as an input. + *

* See the source of the process() method for the nitty gritty details. - * - * It is recommended to use one of the children classes (SetInputTexture2D / SetInputTexture3D) to make the code clearer. + *

+ * It is recommended to use one of the children classes (SetInputTexture2D / SetInputTexture3D) to make the code + * clearer. */ public class SetInputTexture implements StateChange { private final int textureType; @@ -44,17 +46,22 @@ public class SetInputTexture implements StateChange { /** * The constructor, to be used in the initialise method of a node. + *

+ * Sample use: addDesiredStateChange(new SetInputTexture(GL_TEXTURE_2D, 0, water.getId(), "engine:prog.chunk", + * "textureWater")); * - * Sample use: - * addDesiredStateChange(new SetInputTexture(GL_TEXTURE_2D, 0, water.getId(), "engine:prog.chunk", "textureWater")); - * - * @param textureType an opengl constant, can be GL_TEXTURE_2D, GL_TEXTURE_3D and any other texture type listed in https://www.khronos.org/opengl/wiki/Texture#Theory * @param textureSlot a 0-based integer. Notice that textureUnit = GL_TEXTURE0 + textureSlot. See OpenGL spects for maximum allowed values. - * @param textureSlot a 0-based integer. Notice that textureUnit = GL_TEXTURE0 + textureSlot. See OpenGL spects for maximum allowed values. - * @param textureId an integer representing the opengl name of a texture. This is usually the return value of glGenTexture(). + * @param textureType an opengl constant, can be GL_TEXTURE_2D, GL_TEXTURE_3D and any other texture type + * listed in https://www.khronos.org/opengl/wiki/Texture#Theory * @param textureSlot a 0-based integer. + * Notice that textureUnit = GL_TEXTURE0 + textureSlot. See OpenGL spects for maximum allowed values. + * @param textureSlot a 0-based integer. Notice that textureUnit = GL_TEXTURE0 + textureSlot. See OpenGL + * spects for maximum allowed values. + * @param textureId an integer representing the opengl name of a texture. This is usually the return value + * of glGenTexture(). * @param materialUrn a ResourceURN object uniquely identifying a Material asset. * @param materialParameter a String representing the variable within the shader holding the texture. */ - protected SetInputTexture(int textureType, int textureSlot, int textureId, ResourceUrn materialUrn, String materialParameter) { + protected SetInputTexture(int textureType, int textureSlot, int textureId, ResourceUrn materialUrn, + String materialParameter) { this.textureType = textureType; this.textureSlot = textureSlot; this.textureId = textureId; @@ -68,16 +75,19 @@ public class SetInputTexture implements StateChange { /** * The constructor, to be used in the initialise method of a node. + *

+ * Sample use: addDesiredStateChange(new SetInputTexture(GL_TEXTURE_2D, 0, "engine:water", "engine:prog.chunk", + * "textureWater")); * - * Sample use: - * addDesiredStateChange(new SetInputTexture(GL_TEXTURE_2D, 0, "engine:water", "engine:prog.chunk", "textureWater")); - * - * @param textureType an opengl constant, can be GL_TEXTURE_2D, GL_TEXTURE_3D and any other texture type listed in https://www.khronos.org/opengl/wiki/Texture#Theory * @param textureSlot a 0-based integer. Notice that textureUnit = GL_TEXTURE0 + textureSlot. See OpenGL spects for maximum allowed values. + * @param textureType an opengl constant, can be GL_TEXTURE_2D, GL_TEXTURE_3D and any other texture type + * listed in https://www.khronos.org/opengl/wiki/Texture#Theory * @param textureSlot a 0-based integer. + * Notice that textureUnit = GL_TEXTURE0 + textureSlot. See OpenGL spects for maximum allowed values. * @param textureUrn a String identifying a loaded texture, whose id will then be used by this StateChange. * @param materialUrn a ResourceURN object uniquely identifying a Material asset. * @param materialParameter a String representing the variable within the shader holding the texture. */ - protected SetInputTexture(int textureType, int textureSlot, String textureUrn, ResourceUrn materialUrn, String materialParameter) { + protected SetInputTexture(int textureType, int textureSlot, String textureUrn, ResourceUrn materialUrn, + String materialParameter) { this.textureType = textureType; this.textureSlot = textureSlot; this.materialUrn = materialUrn; @@ -123,11 +133,11 @@ public class SetInputTexture implements StateChange { } /** - * Returns a StateChange instance useful to disconnect the given texture from its assigned texture slot. - * Also disconnects the texture from the shader program. + * Returns a StateChange instance useful to disconnect the given texture from its assigned texture slot. Also + * disconnects the texture from the shader program. * - * @return the default instance for the particular slot/material/parameter combination held by this - * SetInputTexture object, cast as a StateChange instance. + * @return the default instance for the particular slot/material/parameter combination held by this SetInputTexture + * object, cast as a StateChange instance. */ @Override public StateChange getDefaultInstance() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFCommonFormat.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFCommonFormat.java index e83a4f87b..b8bb6c627 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFCommonFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFCommonFormat.java @@ -23,8 +23,6 @@ import org.joml.Vector4f; import org.joml.Vector4i; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.AssetData; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.rendering.assets.skeletalmesh.Bone; import org.terasology.engine.rendering.gltf.deserializers.GLTFChannelPathDeserializer; import org.terasology.engine.rendering.gltf.deserializers.GLTFComponentTypeDeserializer; @@ -50,6 +48,8 @@ import org.terasology.engine.rendering.gltf.model.GLTFPrimitive; import org.terasology.engine.rendering.gltf.model.GLTFSkin; import org.terasology.engine.rendering.gltf.model.GLTFTargetBuffer; import org.terasology.engine.rendering.gltf.model.GLTFVersion; +import org.terasology.gestalt.assets.AssetData; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.assets.format.AbstractAssetFileFormat; import org.terasology.gestalt.assets.management.AssetManager; @@ -89,7 +89,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse } protected void readBuffer(byte[] bytes, GLTFAccessor accessor, GLTFBufferView bufferView, TIntList target) { - ByteBuffer byteBuffer = ByteBuffer.wrap(bytes, bufferView.getByteOffset(), accessor.getCount() * accessor.getType().getDimension() * accessor.getComponentType().getByteLength()); + ByteBuffer byteBuffer = + ByteBuffer.wrap(bytes, bufferView.getByteOffset(), accessor.getCount() * accessor.getType().getDimension() * accessor.getComponentType().getByteLength()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); switch (accessor.getComponentType()) { case UNSIGNED_BYTE: @@ -174,9 +175,12 @@ public abstract class GLTFCommonFormat extends AbstractAsse if (uri.endsWith(".bin")) { uri = uri.substring(0, uri.length() - 4); } - ByteBufferAsset bufferAsset = assetManager.getAsset(uri, ByteBufferAsset.class, urn.getModuleName()).orElseThrow(() -> new IOException("Failed to resolve binary uri " + buffer.getUri() + " for " + urn)); + ByteBufferAsset bufferAsset = + assetManager.getAsset(uri, ByteBufferAsset.class, urn.getModuleName()) + .orElseThrow(() -> new IOException("Failed to resolve binary uri " + buffer.getUri() + " for " + urn)); if (bufferAsset.getBytes().length != buffer.getByteLength()) { - throw new IOException("Byte buffer " + uri + " has incorrect length. Expected (" + buffer.getByteLength() + "), actual (" + bufferAsset.getBytes().length + ")"); + throw new IOException("Byte buffer " + uri + " has incorrect length. " + + "Expected (" + buffer.getByteLength() + "), actual (" + bufferAsset.getBytes().length + ")"); } loadedBuffers.add(bufferAsset.getBytes()); } @@ -229,8 +233,9 @@ public abstract class GLTFCommonFormat extends AbstractAsse } protected void checkVersionSupported(ResourceUrn urn, GLTF gltf) throws IOException { - if (gltf.getAsset().getMinVersion() != null && (gltf.getAsset().getMinVersion().getMajor() != SUPPORTED_VERSION.getMajor() || gltf.getAsset().getMinVersion().getMinor() > SUPPORTED_VERSION.getMinor())) { - throw new IOException("Cannot read gltf for " + urn + " as gltf version " + gltf.getAsset().getMinVersion() + " is not supported"); + GLTFVersion minVersion = gltf.getAsset().getMinVersion(); + if (minVersion != null && (minVersion.getMajor() != SUPPORTED_VERSION.getMajor() || minVersion.getMinor() > SUPPORTED_VERSION.getMinor())) { + throw new IOException("Cannot read gltf for " + urn + " as gltf version " + minVersion + " is not supported"); } else if (gltf.getAsset().getVersion().getMajor() != SUPPORTED_VERSION.getMajor()) { throw new IOException("Cannot read gltf for " + urn + " as gltf version " + gltf.getAsset().getVersion() + " is not supported"); } @@ -245,7 +250,7 @@ public abstract class GLTFCommonFormat extends AbstractAsse GLTFNode node = gltf.getNodes().get(nodeIndex); Vector3f position = new Vector3f(); Quaternionf rotation = new Quaternionf(); - Vector3f scale = new Vector3f(1,1,1); + Vector3f scale = new Vector3f(1, 1, 1); if (node.getTranslation() != null) { position.set(node.getTranslation()); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/MeshAttributeSemantic.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/MeshAttributeSemantic.java index d305077cb..3ce66075b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/MeshAttributeSemantic.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/MeshAttributeSemantic.java @@ -21,20 +21,34 @@ public enum MeshAttributeSemantic { Position("POSITION", GLTFAttributeType.VEC3, GLTFComponentType.FLOAT, MeshData::getVertices), Texcoord_0("TEXCOORD_0", GLTFAttributeType.VEC2, GLTFComponentType.FLOAT, k -> k.uv0), Texcoord_1("TEXCOORD_1", GLTFAttributeType.VEC2, GLTFComponentType.FLOAT, k -> k.uv1), - Color_0("COLOR_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, new GLTFComponentType[]{GLTFComponentType.FLOAT}, k-> k.color0), - Joints_0("JOINTS_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, new GLTFComponentType[]{GLTFComponentType.UNSIGNED_BYTE, GLTFComponentType.UNSIGNED_SHORT}, x -> new TFloatArrayList()), - Weights_0("WEIGHTS_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, new GLTFComponentType[]{GLTFComponentType.FLOAT}, x -> new TFloatArrayList()); + Color_0("COLOR_0", + new GLTFAttributeType[]{GLTFAttributeType.VEC4}, + new GLTFComponentType[]{GLTFComponentType.FLOAT}, + k -> k.color0), + Joints_0("JOINTS_0", + new GLTFAttributeType[]{GLTFAttributeType.VEC4}, + new GLTFComponentType[]{GLTFComponentType.UNSIGNED_BYTE, GLTFComponentType.UNSIGNED_SHORT}, + x -> new TFloatArrayList()), + Weights_0("WEIGHTS_0", + new GLTFAttributeType[]{GLTFAttributeType.VEC4}, + new GLTFComponentType[]{GLTFComponentType.FLOAT}, + x -> new TFloatArrayList()); private final String name; private final Set supportedAccessorTypes; private final Set supportedComponentTypes; private final Function targetBufferSupplier; - MeshAttributeSemantic(String name, GLTFAttributeType supportedAccessorType, GLTFComponentType supportedComponentType, Function targetBufferSupplier) { - this(name, new GLTFAttributeType[]{supportedAccessorType}, new GLTFComponentType[]{supportedComponentType}, targetBufferSupplier); + MeshAttributeSemantic(String name, GLTFAttributeType supportedAccessorType, + GLTFComponentType supportedComponentType, + Function targetBufferSupplier) { + this(name, new GLTFAttributeType[]{supportedAccessorType}, new GLTFComponentType[]{supportedComponentType}, + targetBufferSupplier); } - MeshAttributeSemantic(String name, GLTFAttributeType[] supportedAccessorTypes, GLTFComponentType[] supportedComponentTypes, Function targetBufferSupplier) { + MeshAttributeSemantic(String name, GLTFAttributeType[] supportedAccessorTypes, + GLTFComponentType[] supportedComponentTypes, + Function targetBufferSupplier) { this.name = name; this.supportedAccessorTypes = ImmutableSet.copyOf(supportedAccessorTypes); this.supportedComponentTypes = ImmutableSet.copyOf(supportedComponentTypes); diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAccessor.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAccessor.java index f38df9671..77b9bc81a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAccessor.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAccessor.java @@ -7,7 +7,9 @@ import gnu.trove.list.TFloatList; import javax.annotation.Nullable; /** - * GLTFAccessor provides details on how to interpret a buffer view. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-accessor for details + * GLTFAccessor provides details on how to interpret a buffer view. + *

+ * See glTF Specification - accessor for details. */ public class GLTFAccessor { private Integer bufferView; diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAnimationSampler.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAnimationSampler.java index 48cc0809b..cf3cc8a76 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAnimationSampler.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFAnimationSampler.java @@ -3,7 +3,9 @@ package org.terasology.engine.rendering.gltf.model; /** - * GLTF Animation Sampler maps accessors with an algorithm to produce animation data. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#animation-sampler for details + * GLTF Animation Sampler maps accessors with an algorithm to produce animation data. + *

+ * See glTF Specification - sampler for details. */ public class GLTFAnimationSampler { private int input; diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannelTarget.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannelTarget.java index 183f7bd68..0abda7bff 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannelTarget.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannelTarget.java @@ -3,7 +3,9 @@ package org.terasology.engine.rendering.gltf.model; /** - * GLTF Channel Target is the details of what to animate with a GLTF Channel. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#target for details + * GLTF Channel Target is the details of what to animate with a GLTF Channel. + *

+ * See glTF Specification - target for details. */ public class GLTFChannelTarget { private Integer node; diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSparse.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSparse.java index 97aac1466..b4f1b82aa 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSparse.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSparse.java @@ -3,7 +3,9 @@ package org.terasology.engine.rendering.gltf.model; /** - * GLTFSparse provides sparse storage of overrides for attributes. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-sparse for details + * GLTFSparse provides sparse storage of overrides for attributes. + *

+ * See glTF Specification - sparse for details. */ public class GLTFSparse { diff --git a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java index da3856084..719158341 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java @@ -19,8 +19,6 @@ import java.util.Collections; import java.util.Optional; import java.util.Set; -/** - */ @RegisterAssetDataProducer public class IconMeshDataProducer implements AssetDataProducer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java index 7e99eb202..f52c8f8c1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java @@ -6,8 +6,6 @@ package org.terasology.engine.rendering.logic; import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.rendering.assets.animation.MeshAnimation; -/** - */ public class AnimEndEvent implements Event { private MeshAnimation animation; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java index da52b658a..8248dfc0c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java @@ -19,7 +19,7 @@ public class ChunkMeshComponent implements VisualComponent { @Replicate public boolean animated = true; - public ChunkMeshComponent() {} + public ChunkMeshComponent() { } public ChunkMeshComponent(ChunkMesh mesh, AABBf aabb) { this.mesh = mesh; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java index e8e17cc8b..288d35b83 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java @@ -3,7 +3,6 @@ package org.terasology.engine.rendering.logic; import com.google.common.collect.Maps; -import org.joml.Matrix3f; import org.joml.Matrix4f; import org.joml.Vector3f; import org.joml.Vector3fc; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java index a15693212..a949e41b5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering.logic; import org.terasology.engine.network.Replicate; -/** - */ public final class LightFadeComponent implements VisualComponent { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java index f09a67496..079a55e2f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java @@ -12,8 +12,6 @@ import org.terasology.engine.entitySystem.systems.RegisterSystem; import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.registry.In; -/** - */ @RegisterSystem public class LightFadeSystem extends BaseComponentSystem implements UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java index 381726763..959d8b30a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java @@ -8,8 +8,6 @@ import org.terasology.nui.Color; import org.terasology.engine.rendering.assets.mesh.Mesh; import org.terasology.engine.world.block.ForceBlockActive; -/** - */ @ForceBlockActive public final class MeshComponent implements VisualComponent { diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java index fb048af4b..500fc25c8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java @@ -18,8 +18,6 @@ import org.terasology.engine.world.block.ForceBlockActive; import java.util.List; import java.util.Map; -/** - */ @ForceBlockActive public class SkeletalMeshComponent implements VisualComponent { public SkeletalMesh mesh; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java index 8dedc0b5f..046b0329a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java @@ -49,8 +49,6 @@ import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glVertex3f; -/** - */ @RegisterSystem(RegisterMode.CLIENT) public class SkeletonRenderer extends BaseComponentSystem implements RenderSystem, UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java b/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java index 43c4be1e0..c1c8728a1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java @@ -14,8 +14,6 @@ import org.terasology.nui.reflection.WidgetLibrary; import java.util.Deque; -/** - */ public interface NUIManager extends ComponentSystem, FocusManager { HUDScreenLayer getHUD(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java index 8d3d9f140..7bcf27baa 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering.nui; import org.terasology.nui.ControlWidget; -/** - */ public interface UIScreenLayer extends ControlWidget { boolean isLowerLayerVisible(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java index b7c4b7a59..116315282 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java @@ -354,7 +354,7 @@ public abstract class AbstractEditorScreen extends CoreScreenLayer { String[] more = Arrays.copyOfRange(pathArray, 1, pathArray.length); return Paths.get("", moduleManager.getEnvironment().getResources() .getFile(first, more) - .orElseThrow(()-> new RuntimeException("Cannot get path for "+source.getFilename())).getPath().stream().toArray(String[]::new)); + .orElseThrow(()-> new RuntimeException("Cannot get path for " + source.getFilename())).getPath().stream().toArray(String[]::new)); } return null; } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java index ab8a326dc..86a7a886e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java @@ -29,8 +29,8 @@ import static com.google.common.base.Verify.verifyNotNull; @SuppressWarnings("unchecked") public final class NUIEditorNodeUtils { private static final String SAMPLE_LABEL_TEXT = "Welcome to the Terasology NUI editor!\r\n" + - "Visit https://github.com/Terasology/TutorialNui/wiki for a quick overview of the editor,\r\n" + - "as well as the NUI framework itself."; + "Visit https://github.com/Terasology/TutorialNui/wiki for a quick overview of the editor,\r\n" + + "as well as the NUI framework itself."; private NUIEditorNodeUtils() { } @@ -69,10 +69,11 @@ public final class NUIEditorNodeUtils { } /** - * @param type The type of the widget. - * @param id The id of the widget. + * @param type The type of the widget. + * @param id The id of the widget. * @param addLayoutInfo Whether a few layout settings from {@link RelativeLayout} should be added. - * @return The {@link JsonTree} with the given type/id to be used as an empty widget template within {@link NUIEditorScreen}. + * @return The {@link JsonTree} with the given type/id to be used as an empty widget template within {@link + * NUIEditorScreen}. */ public static JsonTree createNewWidget(String type, String id, boolean addLayoutInfo) { JsonTree widget = new JsonTree(new JsonTreeValue(null, null, JsonTreeValue.Type.OBJECT)); @@ -85,9 +86,9 @@ public final class NUIEditorNodeUtils { layoutInfo.addChild(new JsonTreeValue("width", 500, JsonTreeValue.Type.KEY_VALUE_PAIR)); JsonTree hPosition = new JsonTree(new JsonTreeValue("position-horizontal-center", null, JsonTreeValue.Type - .OBJECT)); + .OBJECT)); JsonTree vPosition = new JsonTree(new JsonTreeValue("position-vertical-center", null, JsonTreeValue.Type - .OBJECT)); + .OBJECT)); layoutInfo.addChild(hPosition); layoutInfo.addChild(vPosition); @@ -111,7 +112,7 @@ public final class NUIEditorNodeUtils { } /** - * @param node A node in an asset tree. + * @param node A node in an asset tree. * @param nuiManager The {@link NUIManager} to be used for widget type resolution. * @return The info about this node's type. */ @@ -123,7 +124,8 @@ public final class NUIEditorNodeUtils { Class activeLayoutClass = null; Function> resolve = (String type) -> - verifyNotNull(nuiManager.getWidgetMetadataLibrary().resolve(type, ModuleContext.getContext()), "Failed to resolve widget %s in %s", type, ModuleContext.getContext()) + verifyNotNull(nuiManager.getWidgetMetadataLibrary().resolve(type, ModuleContext.getContext()), + "Failed to resolve widget %s in %s", type, ModuleContext.getContext()) .getType(); for (JsonTree n : pathToRoot) { @@ -133,8 +135,8 @@ public final class NUIEditorNodeUtils { currentClass = resolve.apply(type); } else { if (List.class.isAssignableFrom(currentClass) - && n.getValue().getKey() == null - && "contents".equals(n.getParent().getValue().getKey())) { + && n.getValue().getKey() == null + && "contents".equals(n.getParent().getValue().getKey())) { // Transition from a "contents" list to a UIWidget. currentClass = UIWidget.class; } else { @@ -155,20 +157,21 @@ public final class NUIEditorNodeUtils { currentClass = List.class; } else if (UIWidget.class.isAssignableFrom(currentClass) && "layoutInfo".equals(n.getValue().getKey())) { // Set currentClass to the layout hint type for the active layout. - currentClass = (Class) ReflectionUtil.getTypeParameter(activeLayoutClass.getGenericSuperclass(), 0); + currentClass = + (Class) ReflectionUtil.getTypeParameter(activeLayoutClass.getGenericSuperclass(), 0); } else { String value = n.getValue().toString(); Set fields = ReflectionUtils.getAllFields(currentClass); Optional newField = fields - .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); + .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); if (newField.isPresent()) { currentClass = newField.get().getType(); } else { Optional serializedNameField = fields - .stream() - .filter(f -> f.isAnnotationPresent(SerializedName.class) - && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); + .stream() + .filter(f -> f.isAnnotationPresent(SerializedName.class) + && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); if (serializedNameField.isPresent()) { currentClass = serializedNameField.get().getType(); } else { @@ -209,22 +212,22 @@ public final class NUIEditorNodeUtils { if ("elements".equals(n.getValue().getKey()) || "families".equals(n.getValue().getKey())) { nodeClass = null; } else if (n.getParent().getValue().getKey() != null - && ("elements".equals(n.getParent().getValue().getKey()) - || "families".equals(n.getParent().getValue().getKey()))) { + && ("elements".equals(n.getParent().getValue().getKey()) + || "families".equals(n.getParent().getValue().getKey()))) { nodeClass = UIStyleFragment.class; } else { String value = n.getValue().toString(); Set fields = ReflectionUtils.getAllFields(nodeClass); Optional newField = fields - .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); + .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); if (newField.isPresent()) { nodeClass = newField.get().getType(); } else { Optional serializedNameField = fields - .stream() - .filter(f -> f.isAnnotationPresent(SerializedName.class) - && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); + .stream() + .filter(f -> f.isAnnotationPresent(SerializedName.class) + && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); if (serializedNameField.isPresent()) { nodeClass = serializedNameField.get().getType(); } else { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java index 63ed07c04..463d3049b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java @@ -9,9 +9,7 @@ import org.terasology.nui.Colorc; import java.nio.FloatBuffer; -/** - * - */ + public final class LineRenderer { private LineRenderer() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java index 6b77906d3..9809a6d30 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java @@ -16,7 +16,6 @@ import org.joml.Vector2ic; import org.joml.Vector3f; import org.joml.Vector3fc; import org.lwjgl.opengl.GL11; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.config.Config; import org.terasology.engine.config.RenderingConfig; import org.terasology.engine.context.Context; @@ -29,6 +28,7 @@ import org.terasology.engine.rendering.assets.texture.TextureRegion; import org.terasology.engine.rendering.opengl.FrameBufferObject; import org.terasology.engine.rendering.opengl.LwjglFrameBufferObject; import org.terasology.engine.utilities.Assets; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.joml.geom.AABBfc; import org.terasology.joml.geom.Rectanglef; @@ -97,7 +97,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh // engine tries to load; the build is probably broken. () -> new RuntimeException("Failing to find engine textures")); this.billboard = Assets.getMesh("engine:UIBillboard").get(); - this.fontMeshBuilder = new FontMeshBuilder(context.get(AssetManager.class).getAsset("engine:UIUnderline", Material.class).get()); + this.fontMeshBuilder = new FontMeshBuilder(context.get(AssetManager.class).getAsset("engine:UIUnderline", + Material.class).get()); // failure to load these can be due to failing shaders or missing resources this.renderingConfig = context.get(Config.class).getRendering(); @@ -116,12 +117,12 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh // TODO: figure out previous call to viewport scaling is handled // changing resolution scaling affect viewport of LWJGLCanvas causing strange scaling artifact. glViewport(0, 0, displayDevice.getWidth(), displayDevice.getHeight()); - projMatrix.setOrtho(0, displayDevice.getWidth(), displayDevice.getHeight(),0,0, 2048f); + projMatrix.setOrtho(0, displayDevice.getWidth(), displayDevice.getHeight(), 0, 0, 2048f); modelMatrixStack.pushMatrix(); - modelMatrixStack.set(new Matrix4f().setTranslation(0,0,-1024)); + modelMatrixStack.set(new Matrix4f().setTranslation(0, 0, -1024)); modelMatrixStack.scale(uiScale, uiScale, uiScale); - requestedCropRegion = new Rectanglei(0, 0,displayDevice.getWidth(), displayDevice.getHeight()); + requestedCropRegion = new Rectanglei(0, 0, displayDevice.getWidth(), displayDevice.getHeight()); currentTextureCropRegion = requestedCropRegion; textureMat.setFloat4(CROPPING_BOUNDARIES_PARAM, requestedCropRegion.minX, requestedCropRegion.maxX, requestedCropRegion.minY, requestedCropRegion.maxY); @@ -155,19 +156,21 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh } @Override - public void drawMesh(Mesh mesh, Material material, Rectanglei drawRegion, Rectanglei cropRegion, Quaternionfc rotation, Vector3fc offset, float scale, float alpha) { + public void drawMesh(Mesh mesh, Material material, Rectanglei drawRegion, Rectanglei cropRegion, + Quaternionfc rotation, Vector3fc offset, float scale, float alpha) { if (!material.isRenderable()) { return; } AABBfc meshAABB = mesh.getAABB(); Vector3f meshExtents = meshAABB.extent(new Vector3f()); - float fitScale = 0.35f * Math.min(drawRegion.getSizeX(), drawRegion.getSizeY()) / Math.max(meshExtents.x, Math.max(meshExtents.y, meshExtents.z)); + float fitScale = 0.35f * Math.min(drawRegion.getSizeX(), drawRegion.getSizeY()) / Math.max(meshExtents.x, + Math.max(meshExtents.y, meshExtents.z)); Vector3f centerOffset = meshAABB.center(new Vector3f()); centerOffset.mul(-1.0f); - Matrix4f centerTransform = new Matrix4f().translationRotateScale(centerOffset,new Quaternionf(),1); - Matrix4f userTransform = new Matrix4f().translationRotateScale( offset,rotation, -fitScale * scale); + Matrix4f centerTransform = new Matrix4f().translationRotateScale(centerOffset, new Quaternionf(), 1); + Matrix4f userTransform = new Matrix4f().translationRotateScale(offset, rotation, -fitScale * scale); Matrix4f translateTransform = new Matrix4f().translationRotateScale( new Vector3f((drawRegion.minX + drawRegion.getSizeX() / 2) * uiScale, (drawRegion.minY + drawRegion.getSizeY() / 2) * uiScale, 0), new Quaternionf(), 1); @@ -252,7 +255,7 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh @Override public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, Rectanglei absoluteRegionRectangle, float ux, float uy, float uw, float uh, float alpha) { - if (!((TextureRegion)texture).getTexture().isLoaded()) { + if (!((TextureRegion) texture).getTexture().isLoaded()) { return; } @@ -271,7 +274,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh switch (mode) { case TILED: { Vector2i textureSize = texture.size(); - TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(absoluteRegion.getSizeX(),absoluteRegion.getSizeY())); + TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(absoluteRegion.getSizeX(), + absoluteRegion.getSizeY())); usedTextures.add(key); mesh = cachedTextures.get(key); if (mesh == null || mesh.isDisposed()) { @@ -285,7 +289,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh absoluteRegion.minX, absoluteRegion.minY); - textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), textureArea.minY + uy * textureArea.getSizeY()); + textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), + textureArea.minY + uy * textureArea.getSizeY()); textureMat.setFloat2("texSize", uw * textureArea.getSizeX(), uh * textureArea.getSizeY()); break; } @@ -298,7 +303,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh textureMat.setFloat2("texOffset", textureArea.minX + (ux + 0.5f * texBorderX) * textureArea.getSizeX(), textureArea.minY + (uy + 0.5f * texBorderY) * textureArea.getSizeY()); - textureMat.setFloat2("texSize", (uw - texBorderX) * textureArea.getSizeX(), (uh - texBorderY) * textureArea.getSizeY()); + textureMat.setFloat2("texSize", (uw - texBorderX) * textureArea.getSizeX(), + (uh - texBorderY) * textureArea.getSizeY()); break; } default: { @@ -307,13 +313,14 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh absoluteRegion.minX + 0.5f * (absoluteRegion.getSizeX() - scale.x), absoluteRegion.minY + 0.5f * (absoluteRegion.getSizeY() - scale.y)); - textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), textureArea.minY + uy * textureArea.getSizeY()); + textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), + textureArea.minY + uy * textureArea.getSizeY()); textureMat.setFloat2("texSize", uw * textureArea.getSizeX(), uh * textureArea.getSizeY()); break; } } - textureMat.setTexture("texture", ((TextureRegion)texture).getTexture()); + textureMat.setTexture("texture", ((TextureRegion) texture).getTexture()); textureMat.setFloat4("color", color.rf(), color.gf(), color.bf(), color.af() * alpha); textureMat.setMatrix4("projectionMatrix", projMatrix); @@ -324,11 +331,13 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh } @Override - public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAlign vAlign, Rectanglei absoluteRegionRectangle, + public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAlign vAlign, + Rectanglei absoluteRegionRectangle, Colorc color, Colorc shadowColor, float alpha, boolean underlined) { Rectanglei absoluteRegion = new Rectanglei(absoluteRegionRectangle); - TextCacheKey key = new TextCacheKey(text, font, absoluteRegion.getSizeX(), hAlign, color, shadowColor, underlined); + TextCacheKey key = new TextCacheKey(text, font, absoluteRegion.getSizeX(), hAlign, color, shadowColor, + underlined); usedText.add(key); Map fontMesh = cachedText.get(key); List lines = TextLineBuilder.getLines(font, text, absoluteRegion.getSizeX()); @@ -341,7 +350,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh } } if (fontMesh == null) { - fontMesh = fontMeshBuilder.createTextMesh((org.terasology.engine.rendering.assets.font.Font)font, lines, absoluteRegion.getSizeX(), hAlign, color, shadowColor, underlined); + fontMesh = fontMeshBuilder.createTextMesh((org.terasology.engine.rendering.assets.font.Font) font, lines, + absoluteRegion.getSizeX(), hAlign, color, shadowColor, underlined); cachedText.put(key, fontMesh); } @@ -370,15 +380,17 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh Rectanglei region = new Rectanglei(regionRectangle); if (!currentTextureCropRegion.equals(requestedCropRegion) - && !(currentTextureCropRegion.containsRectangle(region) && requestedCropRegion.containsRectangle(region))) { + && !(currentTextureCropRegion.containsRectangle(region) && requestedCropRegion.containsRectangle(region))) { textureMat.setFloat4(CROPPING_BOUNDARIES_PARAM, requestedCropRegion.minX, requestedCropRegion.maxX, - requestedCropRegion.minY, requestedCropRegion.maxY); + requestedCropRegion.minY, requestedCropRegion.maxY); currentTextureCropRegion = requestedCropRegion; } - Vector2i textureSize = new Vector2i(TeraMath.ceilToInt(texture.getWidth() * uw), TeraMath.ceilToInt(texture.getHeight() * uh)); + Vector2i textureSize = new Vector2i(TeraMath.ceilToInt(texture.getWidth() * uw), + TeraMath.ceilToInt(texture.getHeight() * uh)); - TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(region.getSizeX(), region.getSizeY()), border, tile); + TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(region.getSizeX(), region.getSizeY()), + border, tile); usedTextures.add(key); Mesh mesh = cachedTextures.get(key); if (mesh == null || mesh.isDisposed()) { @@ -404,9 +416,9 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh if (tile) { addTiles(builder, new Rectanglei(border.getLeft(), 0).setSize(centerHoriz, border.getTop()), - new Rectanglef(left, 0, right, top), - new Vector2i(textureSize.x - border.getTotalWidth(), border.getTop()), - new Rectanglef(leftTex, 0, rightTex, topTex)); + new Rectanglef(left, 0, right, top), + new Vector2i(textureSize.x - border.getTotalWidth(), border.getTop()), + new Rectanglef(leftTex, 0, rightTex, topTex)); } else { addRectPoly(builder, left, 0, right, top, leftTex, 0, rightTex, topTex); } @@ -418,9 +430,9 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh if (border.getLeft() != 0) { if (tile) { addTiles(builder, new Rectanglei(0, border.getTop()).setSize(border.getLeft(), centerVert), - new Rectanglef(0, top, left, bottom), - new Vector2i(border.getLeft(), textureSize.y - border.getTotalHeight()), - new Rectanglef(0, topTex, leftTex, bottomTex)); + new Rectanglef(0, top, left, bottom), + new Vector2i(border.getLeft(), textureSize.y - border.getTotalHeight()), + new Rectanglef(0, topTex, leftTex, bottomTex)); } else { addRectPoly(builder, 0, top, left, bottom, 0, topTex, leftTex, bottomTex); } @@ -428,19 +440,20 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh if (tile) { addTiles(builder, new Rectanglei(border.getLeft(), border.getTop()).setSize(centerHoriz, centerVert), - new Rectanglef(left, top, right, bottom), - new Vector2i(textureSize.x - border.getTotalWidth(), textureSize.y - border.getTotalHeight()), - new Rectanglef(leftTex, topTex, rightTex, bottomTex)); + new Rectanglef(left, top, right, bottom), + new Vector2i(textureSize.x - border.getTotalWidth(), textureSize.y - border.getTotalHeight()), + new Rectanglef(leftTex, topTex, rightTex, bottomTex)); } else { addRectPoly(builder, left, top, right, bottom, leftTex, topTex, rightTex, bottomTex); } if (border.getRight() != 0) { if (tile) { - addTiles(builder, new Rectanglei(region.getSizeX() - border.getRight(), border.getTop()).setSize(border.getRight(), centerVert), - new Rectanglef(right, top, 1, bottom), - new Vector2i(border.getRight(), textureSize.y - border.getTotalHeight()), - new Rectanglef(rightTex, topTex, 1, bottomTex)); + addTiles(builder, + new Rectanglei(region.getSizeX() - border.getRight(), border.getTop()).setSize(border.getRight(), centerVert), + new Rectanglef(right, top, 1, bottom), + new Vector2i(border.getRight(), textureSize.y - border.getTotalHeight()), + new Rectanglef(rightTex, topTex, 1, bottomTex)); } else { addRectPoly(builder, right, top, 1, bottom, rightTex, topTex, 1, bottomTex); } @@ -451,10 +464,11 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh addRectPoly(builder, 0, bottom, left, 1, 0, bottomTex, leftTex, 1); } if (tile) { - addTiles(builder, new Rectanglei(border.getLeft(), region.getSizeY() - border.getBottom()).setSize(centerHoriz, border.getBottom()), - new Rectanglef(left, bottom, right, 1), - new Vector2i(textureSize.x - border.getTotalWidth(), border.getBottom()), - new Rectanglef(leftTex, bottomTex, rightTex, 1)); + addTiles(builder, + new Rectanglei(border.getLeft(), region.getSizeY() - border.getBottom()).setSize(centerHoriz, border.getBottom()), + new Rectanglef(left, bottom, right, 1), + new Vector2i(textureSize.x - border.getTotalWidth(), border.getBottom()), + new Rectanglef(leftTex, bottomTex, rightTex, 1)); } else { addRectPoly(builder, left, bottom, right, 1, leftTex, bottomTex, rightTex, 1); } @@ -470,7 +484,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh textureMat.setFloat2("offset", region.minX, region.minY); Rectanglef textureArea = texture.getRegion(); - textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.lengthX(), textureArea.minY + uy * textureArea.lengthY()); + textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.lengthX(), + textureArea.minY + uy * textureArea.lengthY()); textureMat.setFloat2("texSize", uw * textureArea.lengthX(), uh * textureArea.lengthY()); textureMat.setTexture("texture", ((TextureRegion) texture).getTexture()); @@ -484,15 +499,18 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh // TODO: Implement? See https://github.com/MovingBlocks/TeraNUI/pull/2/commits/84ea7f936008fe123d3d6cf9d0d164b15b27cd6d } - private void addRectPoly(MeshBuilder builder, float minX, float minY, float maxX, float maxY, float texMinX, float texMinY, float texMaxX, float texMaxY) { - builder.addPoly(new Vector3f(minX, minY, 0), new Vector3f(maxX, minY, 0), new Vector3f(maxX, maxY, 0), new Vector3f(minX, maxY, 0)); + private void addRectPoly(MeshBuilder builder, float minX, float minY, float maxX, float maxY, float texMinX, + float texMinY, float texMaxX, float texMaxY) { + builder.addPoly(new Vector3f(minX, minY, 0), new Vector3f(maxX, minY, 0), new Vector3f(maxX, maxY, 0), + new Vector3f(minX, maxY, 0)); builder.addTexCoord(texMinX, texMinY); builder.addTexCoord(texMaxX, texMinY); builder.addTexCoord(texMaxX, texMaxY); builder.addTexCoord(texMinX, texMaxY); } - private void addTiles(MeshBuilder builder, Rectanglei drawRegion, Rectanglef subDrawRegion, Vector2i textureSize, Rectanglef subTextureRegion) { + private void addTiles(MeshBuilder builder, Rectanglei drawRegion, Rectanglef subDrawRegion, Vector2i textureSize, + Rectanglef subTextureRegion) { int tileW = textureSize.x; int tileH = textureSize.y; int horizTiles = TeraMath.fastAbs((drawRegion.getSizeX() - 1) / tileW) + 1; @@ -506,16 +524,27 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh int left = offsetX + tileW * tileX; int top = offsetY + tileH * tileY; - float vertLeft = subDrawRegion.minX + subDrawRegion.getSizeX() * Math.max((float) left / drawRegion.getSizeX(), 0); - float vertTop = subDrawRegion.minY + subDrawRegion.getSizeY() * Math.max((float) top / drawRegion.getSizeY(), 0); - float vertRight = subDrawRegion.minX + subDrawRegion.getSizeX() * Math.min((float) (left + tileW) / drawRegion.getSizeX(), 1); - float vertBottom = subDrawRegion.minY + subDrawRegion.getSizeY() * Math.min((float) (top + tileH) / drawRegion.getSizeY(), 1); - float texCoordLeft = subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.max(left, 0) - left) / tileW; - float texCoordTop = subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.max(top, 0) - top) / tileH; - float texCoordRight = subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.min(left + tileW, drawRegion.getSizeX()) - left) / tileW; - float texCoordBottom = subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.min(top + tileH, drawRegion.getSizeY()) - top) / tileH; + float vertLeft = + subDrawRegion.minX + subDrawRegion.getSizeX() * Math.max((float) left / drawRegion.getSizeX() + , 0); + float vertTop = + subDrawRegion.minY + subDrawRegion.getSizeY() * Math.max((float) top / drawRegion.getSizeY(), + 0); + float vertRight = + subDrawRegion.minX + subDrawRegion.getSizeX() * Math.min((float) (left + tileW) / drawRegion.getSizeX(), 1); + float vertBottom = + subDrawRegion.minY + subDrawRegion.getSizeY() * Math.min((float) (top + tileH) / drawRegion.getSizeY(), 1); + float texCoordLeft = + subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.max(left, 0) - left) / tileW; + float texCoordTop = + subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.max(top, 0) - top) / tileH; + float texCoordRight = subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.min(left + tileW, + drawRegion.getSizeX()) - left) / tileW; + float texCoordBottom = subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.min(top + tileH, + drawRegion.getSizeY()) - top) / tileH; - addRectPoly(builder, vertLeft, vertTop, vertRight, vertBottom, texCoordLeft, texCoordTop, texCoordRight, texCoordBottom); + addRectPoly(builder, vertLeft, vertTop, vertRight, vertBottom, texCoordLeft, texCoordTop, + texCoordRight, texCoordBottom); } } } @@ -540,7 +569,8 @@ public class LwjglCanvasRenderer implements TerasologyCanvasRenderer, PropertyCh private final Colorc shadowColor; private final boolean underlined; - TextCacheKey(String text, Font font, int maxWidth, HorizontalAlign alignment, Colorc baseColor, Colorc shadowColor, boolean underlined) { + TextCacheKey(String text, Font font, int maxWidth, HorizontalAlign alignment, Colorc baseColor, + Colorc shadowColor, boolean underlined) { this.text = text; this.font = font; this.width = maxWidth; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java index 529bf44b9..fd600ea33 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java @@ -85,8 +85,6 @@ import java.util.Set; import static com.google.common.base.Verify.verifyNotNull; -/** - */ public class NUIManagerInternal extends BaseComponentSystem implements NUIManager, PropertyChangeListener { private final ModuleEnvironment moduleEnvironment; private final TypeWidgetFactoryRegistry typeWidgetFactoryRegistry; @@ -152,9 +150,12 @@ public class NUIManagerInternal extends BaseComponentSystem implements NUIManage && bindsManager.getBindsConfig().hasBinds(new SimpleUri("engine:tabbingUI")) && bindsManager.getBindsConfig().hasBinds(new SimpleUri("engine:tabbingModifier")) && bindsManager.getBindsConfig().hasBinds(new SimpleUri("engine:activate"))) { - TabbingManager.tabForwardInput = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:tabbingUI")).get(0); - TabbingManager.tabBackInputModifier = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:tabbingModifier")).get(0); - TabbingManager.activateInput = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:activate")).get(0); + TabbingManager.tabForwardInput = + bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:tabbingUI")).get(0); + TabbingManager.tabBackInputModifier = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine" + + ":tabbingModifier")).get(0); + TabbingManager.activateInput = + bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:activate")).get(0); } moduleEnvironment = context.get(ModuleManager.class).getEnvironment(); @@ -187,7 +188,8 @@ public class NUIManagerInternal extends BaseComponentSystem implements NUIManage } public void refreshWidgetsLibrary() { - widgetsLibrary = new WidgetLibrary(context.get(ModuleManager.class).getEnvironment(), context.get(ReflectFactory.class), context.get(CopyStrategyLibrary.class)); + widgetsLibrary = new WidgetLibrary(context.get(ModuleManager.class).getEnvironment(), + context.get(ReflectFactory.class), context.get(CopyStrategyLibrary.class)); ModuleEnvironment environment = context.get(ModuleManager.class).getEnvironment(); for (Class type : environment.getSubtypesOf(UIWidget.class)) { Name module = verifyNotNull(environment.getModuleProviding(type), "No module provides %s", type); @@ -269,9 +271,10 @@ public class NUIManagerInternal extends BaseComponentSystem implements NUIManage @Override public ResourceUrn getUri(UIScreenLayer screen) { - BiMap lookup = HashBiMap.create(screenLookup); + BiMap lookup = HashBiMap.create(screenLookup); return lookup.inverse().remove(screen); } + @Override public void closeScreen(UIScreenLayer screen) { if (screens.remove(screen)) { @@ -760,10 +763,13 @@ public class NUIManagerInternal extends BaseComponentSystem implements NUIManage } } - //bind input events (will be send after raw input events, if a bind button was pressed and the raw input event hasn't consumed the event) + //bind input events (will be send after raw input events, if a bind button was pressed and the raw input event + // hasn't consumed the event) @ReceiveEvent(components = ClientComponent.class, priority = EventPriority.PRIORITY_HIGH) public void bindEvent(BindButtonEvent event, EntityRef entity) { - NUIBindButtonEvent nuiEvent = new NUIBindButtonEvent(mouse, keyboard, new ResourceUrn(event.getId().getModuleName(), event.getId().getObjectName()).toString(), event.getState()); + NUIBindButtonEvent nuiEvent = new NUIBindButtonEvent(mouse, keyboard, + new ResourceUrn(event.getId().getModuleName(), event.getId().getObjectName()).toString(), + event.getState()); if (focus != null) { focus.onBindEvent(nuiEvent); @@ -816,6 +822,7 @@ public class NUIManagerInternal extends BaseComponentSystem implements NUIManage setHUDVisible(true); } } + @Override public CanvasControl getCanvas() { return canvas; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java index a8282d79b..4d0c4ab5d 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java @@ -27,8 +27,6 @@ import org.terasology.engine.utilities.Assets; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -/** - */ public class TerasologyCanvasImpl extends CanvasImpl implements PropertyChangeListener { private static final Logger logger = LoggerFactory.getLogger(TerasologyCanvasImpl.class); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java index 2418c065c..827c5dccf 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java @@ -12,8 +12,6 @@ import org.terasology.joml.geom.Rectanglei; import org.terasology.nui.canvas.CanvasRenderer; import org.terasology.engine.rendering.assets.mesh.Mesh; -/** - */ public interface TerasologyCanvasRenderer extends CanvasRenderer { FrameBufferObject getFBO(ResourceUrn urn, Vector2ic size); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java index a3c19862c..e8e726f21 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java @@ -40,7 +40,7 @@ public class TypeWidgetLibraryImpl implements TypeWidgetLibrary { @Override public Optional> getBuilder(TypeInfo type) { - try(ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { + try (ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { // Iterate in reverse order so that later added factories take priority for (TypeWidgetFactory factory : Lists.reverse(widgetFactories.getFactories())) { @@ -62,7 +62,7 @@ public class TypeWidgetLibraryImpl implements TypeWidgetLibrary { @Override public Optional getBaseTypeWidget(Binding binding, TypeInfo baseType) { - try(ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { + try (ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { if (Primitives.isWrapperType(baseType.getRawType()) || baseType.getRawType().isPrimitive()) { return getWidget(binding, baseType); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java index 4913a7c15..bcb1d0682 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java @@ -14,8 +14,6 @@ import org.terasology.reflection.reflect.ReflectFactory; import java.lang.reflect.Field; -/** - */ public class WidgetMetadata extends ClassMetadata> { /** diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java index 631573b54..17339b005 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java @@ -12,8 +12,6 @@ import org.terasology.nui.UIWidget; import java.util.Arrays; import java.util.Iterator; -/** - */ public abstract class CoreHudWidget extends CoreWidget implements ControlWidget { @LayoutConfig diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java index 82a89b0c2..7c4d7eee0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java @@ -23,8 +23,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Optional; -/** - */ public class HUDScreenLayer extends CoreScreenLayer { private Map elementsLookup = Maps.newLinkedHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java index 59ecd64b0..40161465c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.nui.layers.hud; -/** - */ public class HudToolbar extends CoreHudWidget { @Override public void initialise() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java index 744eb26e7..f95775355 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java @@ -14,8 +14,6 @@ import org.terasology.nui.databinding.DefaultBinding; import java.util.List; -/** - */ public class UICrosshair extends CoreWidget { @LayoutConfig diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java index c7d088d3b..5799aac10 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java @@ -10,9 +10,7 @@ import org.terasology.engine.rendering.nui.CoreScreenLayer; import org.terasology.engine.rendering.nui.editor.systems.NUIEditorSystem; import org.terasology.engine.rendering.nui.editor.systems.NUISkinEditorSystem; -/** - * - */ + public class DevToolsMenuScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:devToolsMenuScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java index 6c2752d59..e283824e0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java @@ -10,8 +10,6 @@ import org.terasology.nui.widgets.UIText; import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.nui.BaseInteractionScreen; -/** - */ public class InspectionScreen extends BaseInteractionScreen { private UIText fullDescriptionLabel; private UIText entityIdField; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java index 7e7ff4b30..405c94406 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java @@ -6,8 +6,6 @@ package org.terasology.engine.rendering.nui.layers.ingame.metrics; import gnu.trove.map.TObjectDoubleMap; import org.terasology.engine.monitoring.PerformanceMonitor; -/** - */ final class AllocationsMode extends TimeMetricsMode { AllocationsMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java index 962da532f..be22dfe6f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java @@ -28,7 +28,8 @@ public class HeapAllocationMode extends MetricsMode { for (MemoryPoolMXBean mpBean : ManagementFactory.getMemoryPoolMXBeans()) { if (mpBean.getType() == MemoryType.HEAP) { MemoryUsage usage = mpBean.getUsage(); - builder.append(String.format("Memory Heap: %s - Memory Usage: %.2f MB, Max Memory: %.2f MB \n", mpBean.getName(), usage.getUsed() / MB_SIZE, usage.getMax() / MB_SIZE)); + builder.append(String.format("Memory Heap: %s - Memory Usage: %.2f MB, Max Memory: %.2f MB \n", + mpBean.getName(), usage.getUsed() / MB_SIZE, usage.getMax() / MB_SIZE)); } } return builder.toString(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java index ec80b512e..e07f2fec0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java @@ -8,8 +8,6 @@ import org.terasology.engine.network.NetworkMode; import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.registry.CoreRegistry; -/** - */ final class NetworkStatsMode extends MetricsMode { private long lastTime; private Time time; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java index b3a4c170f..8ccca7c16 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.nui.layers.ingame.metrics; -/** - */ public class NullMetricsMode extends MetricsMode { public NullMetricsMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java index 1c18e6188..21e5baa2a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java @@ -6,8 +6,6 @@ package org.terasology.engine.rendering.nui.layers.ingame.metrics; import gnu.trove.map.TObjectDoubleMap; import org.terasology.engine.monitoring.PerformanceMonitor; -/** - */ final class RunningMeansMode extends TimeMetricsMode { RunningMeansMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java index 055ff0e36..65225765a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java @@ -6,8 +6,6 @@ package org.terasology.engine.rendering.nui.layers.ingame.metrics; import org.terasology.engine.monitoring.ThreadMonitor; import org.terasology.engine.monitoring.impl.SingleThreadMonitor; -/** - */ final class RunningThreadsMode extends MetricsMode { RunningThreadsMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java index a1a9a2d6e..6a53253a4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java @@ -6,8 +6,6 @@ package org.terasology.engine.rendering.nui.layers.ingame.metrics; import gnu.trove.map.TObjectDoubleMap; import org.terasology.engine.monitoring.PerformanceMonitor; -/** - */ final class SpikesMode extends TimeMetricsMode { SpikesMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java index 0a42693c8..f31afd4c6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java @@ -10,8 +10,6 @@ import gnu.trove.map.TObjectDoubleMap; import java.text.NumberFormat; import java.util.List; -/** - */ public abstract class TimeMetricsMode extends MetricsMode { private int limit; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java index 24a5a5c41..003777ddf 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering.nui.layers.ingame.metrics; import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.world.WorldRenderer; -/** - */ public class WorldRendererMode extends MetricsMode { public WorldRendererMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java index b8118505d..ee616c382 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java @@ -15,8 +15,6 @@ import org.terasology.engine.rendering.nui.CoreScreenLayer; import java.util.function.Consumer; -/** - */ public class AddServerPopup extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:addServerPopup!instance"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java index 0bc17f1d5..14767bd18 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java @@ -7,8 +7,6 @@ import org.terasology.nui.databinding.Binding; import org.terasology.nui.widgets.UIText; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class EnterTextPopup extends CoreScreenLayer { private Binding inputBinding; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java index 9eb2636cb..0a23106e6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java @@ -54,8 +54,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -/** - */ public class JoinGameScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:joinGameScreen"); @@ -479,8 +477,9 @@ public class JoinGameScreen extends CoreScreenLayer { } catch (IOException e) { String text = translationSystem.translate("${engine:menu#connection-failed}"); // Check if selection name is same as earlier when response is received before updating ping field - if (name.equals(visibleList.getSelection().getName())) - GameThread.asynch(() -> ping.setText(FontColor.getColored(text, Color.RED))); + if (name.equals(visibleList.getSelection().getName())) { + GameThread.asynch(() -> ping.setText(FontColor.getColored(text, Color.RED))); + } } }); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java index 66a8a949d..4325cee98 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java @@ -9,8 +9,6 @@ import org.terasology.nui.widgets.ActivateEventListener; import org.terasology.nui.widgets.UILabel; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ @API public class MessagePopup extends CoreScreenLayer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java index cb47b27b0..026f78397 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java @@ -25,7 +25,6 @@ import org.terasology.engine.world.generator.internal.WorldGeneratorManager; import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.module.Module; import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; -import org.terasology.gestalt.module.resources.DirectoryFileSource; import org.terasology.gestalt.naming.Name; import org.terasology.input.Keyboard; import org.terasology.nui.Canvas; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java index 592be68c5..d4030918f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java @@ -69,11 +69,15 @@ public class ReplayScreen extends SelectionScreen { }); delete.subscribe(button -> { - TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, TwoButtonPopup.class); - confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup-title}"), + TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, + TwoButtonPopup.class); + confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup" + + "-title}"), translationSystem.translate("${engine:menu#remove-confirmation-popup-message}")); - confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), this::removeSelectedReplay); - confirmationPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { }); + confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), + this::removeSelectedReplay); + confirmationPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { + }); }); close.subscribe(button -> { @@ -91,7 +95,8 @@ public class ReplayScreen extends SelectionScreen { refreshGameInfoList(GameProvider.getSavedRecordings()); } else { final MessagePopup popup = getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class); - popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), translationSystem.translate("${engine:menu#game-details-errors-message-body}")); + popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), + translationSystem.translate("${engine:menu#game-details-errors-message-body}")); popup.subscribeButton(e -> triggerBackAnimation()); getManager().pushScreen(popup); // disable child widgets @@ -108,7 +113,8 @@ public class ReplayScreen extends SelectionScreen { } private void removeSelectedReplay() { - final Path world = PathManager.getInstance().getRecordingPath(getGameInfos().getSelection().getManifest().getTitle()); + final Path world = + PathManager.getInstance().getRecordingPath(getGameInfos().getSelection().getManifest().getTitle()); remove(getGameInfos(), world, REMOVE_STRING); } @@ -121,7 +127,8 @@ public class ReplayScreen extends SelectionScreen { CoreRegistry.get(GameEngine.class).changeState(new StateLoading(manifest, NetworkMode.NONE)); } catch (Exception e) { logger.error("Failed to load saved game", e); - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", e.getMessage()); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", + e.getMessage()); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java index 1adb2b2ff..cb2f01b96 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java @@ -80,10 +80,13 @@ public class SelectGameScreen extends SelectionScreen { }); delete.subscribe(e -> { - TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, TwoButtonPopup.class); - confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup-title}"), + TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, + TwoButtonPopup.class); + confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup" + + "-title}"), translationSystem.translate("${engine:menu#remove-confirmation-popup-message}")); - confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), this::removeSelectedGame); + confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), + this::removeSelectedGame); confirmationPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { }); }); @@ -99,7 +102,8 @@ public class SelectGameScreen extends SelectionScreen { details.subscribe(e -> { final GameInfo gameInfo = getGameInfos().getSelection(); if (gameInfo != null) { - final GameDetailsScreen detailsScreen = getManager().createScreen(GameDetailsScreen.ASSET_URI, GameDetailsScreen.class); + final GameDetailsScreen detailsScreen = getManager().createScreen(GameDetailsScreen.ASSET_URI, + GameDetailsScreen.class); detailsScreen.setGameInfo(gameInfo); detailsScreen.setPreviews(previewSlideshow.getImages()); getManager().pushScreen(detailsScreen); @@ -109,7 +113,8 @@ public class SelectGameScreen extends SelectionScreen { } private void removeSelectedGame() { - final Path world = PathManager.getInstance().getSavePath(getGameInfos().getSelection().getManifest().getTitle()); + final Path world = + PathManager.getInstance().getSavePath(getGameInfos().getSelection().getManifest().getTitle()); remove(getGameInfos(), world, REMOVE_STRING); } @@ -119,7 +124,8 @@ public class SelectGameScreen extends SelectionScreen { if (isValidScreen()) { if (GameProvider.isSavesFolderEmpty()) { - final NewGameScreen newGameScreen = getManager().createScreen(NewGameScreen.ASSET_URI, NewGameScreen.class); + final NewGameScreen newGameScreen = getManager().createScreen(NewGameScreen.ASSET_URI, + NewGameScreen.class); newGameScreen.setUniverseWrapper(universeWrapper); triggerForwardAnimation(newGameScreen); } @@ -131,7 +137,8 @@ public class SelectGameScreen extends SelectionScreen { refreshGameInfoList(GameProvider.getSavedGames()); } else { final MessagePopup popup = getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class); - popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), translationSystem.translate("${engine:menu#game-details-errors-message-body}")); + popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), + translationSystem.translate("${engine:menu#game-details-errors-message-body}")); popup.subscribeButton(e -> triggerBackAnimation()); getManager().pushScreen(popup); // disable child widgets @@ -162,10 +169,12 @@ public class SelectGameScreen extends SelectionScreen { final GameManifest manifest = item.getManifest(); config.getWorldGeneration().setDefaultSeed(manifest.getSeed()); config.getWorldGeneration().setWorldTitle(manifest.getTitle()); - CoreRegistry.get(GameEngine.class).changeState(new StateLoading(manifest, (isLoadingAsServer()) ? NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); + CoreRegistry.get(GameEngine.class).changeState(new StateLoading(manifest, (isLoadingAsServer()) ? + NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); } catch (Exception e) { logger.error("Failed to load saved game", e); - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", e.getMessage()); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", + e.getMessage()); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java index 067faea49..009828a9d 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java @@ -121,10 +121,9 @@ class ServerListDownloader { jsonReader.endArray(); - if(servers.size() == 0) { + if (servers.size() == 0) { status = String.format("Server Error!"); - } - else { + } else { status = String.format("${engine:menu#server-list-complete}"); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java index 40c57eef7..0837b1f2b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java @@ -14,7 +14,6 @@ import org.terasology.engine.core.module.ModuleManager; import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.logic.behavior.asset.BehaviorTree; -import org.terasology.engine.logic.behavior.asset.BehaviorTreeData; import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; @@ -48,14 +47,11 @@ import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; import org.terasology.gestalt.module.dependencyresolution.ResolutionResult; import org.terasology.gestalt.naming.Name; import org.terasology.nui.WidgetUtil; -import org.terasology.nui.asset.UIData; import org.terasology.nui.asset.UIElement; import org.terasology.nui.databinding.Binding; import org.terasology.nui.databinding.ReadOnlyBinding; import org.terasology.nui.itemRendering.StringTextRenderer; -import org.terasology.nui.skin.UISkin; import org.terasology.nui.skin.UISkinAsset; -import org.terasology.nui.skin.UISkinData; import org.terasology.nui.widgets.UIDropdownScrollable; import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.reflect.ReflectFactory; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java index d7c80af4a..1fc4e96ab 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java @@ -245,10 +245,14 @@ public class GameDetailsScreen extends CoreScreenLayer { } else { gameTitle = worldInfo.getCustomTitle(); } - return translationSystem.translate("${engine:menu#game-details-game-title} ") + gameTitle + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-game-seed} ") + worldInfo.getSeed() + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-world-generator}: ") + worldGeneratorManager.getWorldGeneratorInfo(worldInfo.getWorldGenerator()).getDisplayName() + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-game-duration} ") + return translationSystem.translate("${engine:menu#game-details-game-title} ") + gameTitle + + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-game-seed} ") + worldInfo.getSeed() + + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-world-generator}: ") + + worldGeneratorManager.getWorldGeneratorInfo(worldInfo.getWorldGenerator()).getDisplayName() + + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-game-duration} ") + DateTimeHelper.getDeltaBetweenTimestamps(new Date(0).getTime(), worldInfo.getTime()); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java index 393873585..26d775372 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java @@ -11,8 +11,6 @@ import org.terasology.nui.databinding.Binding; import java.util.List; -/** - */ public class InputConfigBinding implements Binding { private BindsConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java index 7cbe0144e..bf3e4fabf 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java @@ -50,9 +50,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -/** - * - */ + public class InputSettingsScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:inputSettingsScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java index 5def70694..60c61d7d1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java @@ -23,8 +23,6 @@ import org.terasology.nui.events.NUIMouseWheelEvent; import java.util.List; -/** - */ public class UIInputBind extends CoreWidget { private boolean capturingInput; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java index 95932b3c8..f8f39aa0f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java @@ -8,8 +8,6 @@ import org.terasology.nui.widgets.UILoadBar; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class LoadingScreen extends CoreScreenLayer { private UILabel messageLabel; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java index 171faab22..e4177be86 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java @@ -11,8 +11,6 @@ import org.terasology.nui.widgets.UISlider; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class AudioSettingsScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:AudioMenuScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java index 5ec1057f5..13012dd9b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java @@ -12,8 +12,6 @@ import org.terasology.nui.WidgetUtil; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class SettingsMenuScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:settingsMenuScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java index db0ba3290..2388ac8ab 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; -/** - */ public enum CameraSetting { NORMAL("${engine:menu#camera-setting-normal}", 1), SMOOTH("${engine:menu#camera-setting-smooth}", 5), diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java index c4d16d4e4..18ea30ad1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class CameraSettingBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java index 93d73fedd..ae6e45929 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; -/** - */ public enum DynamicShadows { OFF("${engine:menu#shadows-off}", false, false), ON("${engine:menu#shadows-on}", true, false), diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java index a2cf4f409..11cccb1af 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class DynamicShadowsBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java index 416dd806d..20b5049a3 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; -/** - */ public enum Preset { MINIMAL("${engine:menu#video-preset-minimal}") { @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java index f17ddfb37..d717fbcee 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class PresetBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java index d64ebcf21..d8d3acc81 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; -/** - */ public enum WaterReflection { SKY("${engine:menu#water-reflections-sky}") { @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java index 07e3630ff..208aacd2f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java @@ -5,8 +5,6 @@ package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class WaterReflectionBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java index deac88e74..6e9e53763 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java @@ -42,8 +42,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -/** - */ @RegisterAssetFileFormat public class UISkinFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java index f17e39e1a..7ef41bb96 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java @@ -119,7 +119,7 @@ public class UIButtonWebBrowser extends UIButton { translationSystem.translate("${engine:menu#button-web-browser-confirmation-message}") + NEW_LINE + this.url); confirmUrlPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), this::openBrowser); - confirmUrlPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> {}); + confirmUrlPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { }); try { if (webBrowserConfig != null) { confirmUrlPopup.setCheckbox(webBrowserConfig, this.url); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java index 70b7c5892..e42b40506 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java @@ -24,12 +24,12 @@ public class BuiltinTypeWidgetTestScreen extends TypeWidgetTestScreen { newBinding(TestEnum.class); - newBinding(new TypeInfo>() {}); - newBinding(new TypeInfo>() {}); + newBinding(new TypeInfo>() { }); + newBinding(new TypeInfo>() { }); newBinding(Boolean[].class); - newBinding(new TypeInfo() {}); - newBinding(new TypeInfo>>() {}); + newBinding(new TypeInfo() { }); + newBinding(new TypeInfo>>() { }); newBinding(WithFinalFields.class); @@ -44,9 +44,13 @@ public class BuiltinTypeWidgetTestScreen extends TypeWidgetTestScreen { private String displayName; - TestEnum() {this(null);} + TestEnum() { + this(null); + } - TestEnum(String displayName) {this.displayName = displayName;} + TestEnum(String displayName) { + this.displayName = displayName; + } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java index eb8e43ec0..fda8e5d74 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java @@ -483,7 +483,7 @@ public final class FBO { } @Override - public String toString(){ + public String toString() { return "FBO: " + this.fboName; } diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java index 401e6bae6..e477e2ff8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java @@ -2,9 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.opengl; -/** - * - */ + public interface FrameBufferObject { void unbindFrame(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java index 0f4236b22..d2e2b2729 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java @@ -61,7 +61,8 @@ public class GLSLMaterial extends BaseMaterial { private DisposalAction disposalAction; private MaterialData materialData; - public GLSLMaterial(ResourceUrn urn, AssetType assetType, MaterialData data, LwjglGraphicsProcessing graphicsProcessing, GLSLMaterial.DisposalAction disposalAction) { + public GLSLMaterial(ResourceUrn urn, AssetType assetType, MaterialData data, + LwjglGraphicsProcessing graphicsProcessing, GLSLMaterial.DisposalAction disposalAction) { super(urn, assetType, disposalAction); this.graphicsProcessing = graphicsProcessing; this.disposalAction = disposalAction; diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java index 9f1573350..5fddbd542 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java @@ -32,8 +32,6 @@ import java.util.List; import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; -/** - */ public class OpenGLMesh extends Mesh { private static final Logger logger = LoggerFactory.getLogger(OpenGLMesh.class); private AABBf aabb = new AABBf(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java index 26c26deb3..23ed46e67 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java @@ -28,8 +28,6 @@ import java.util.List; import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; -/** - */ public class OpenGLSkeletalMesh extends SkeletalMesh { private static final int VERTEX_SIZE = 3 * Float.BYTES; private static final int NORMAL_SIZE = 3 * Float.BYTES; diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java index 7c80938a8..13a894237 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java @@ -6,7 +6,6 @@ import com.google.common.collect.Lists; import org.joml.Vector2i; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.engine.core.subsystem.lwjgl.LwjglGraphics; import org.terasology.gestalt.assets.AssetType; import org.terasology.gestalt.assets.DisposableResource; import org.terasology.gestalt.assets.ResourceUrn; @@ -19,8 +18,6 @@ import org.terasology.engine.rendering.assets.texture.TextureData; import java.nio.ByteBuffer; import java.util.List; -/** - */ public class OpenGLTexture extends Texture { private static final Logger logger = LoggerFactory.getLogger(OpenGLTexture.class); diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java index 8bdf0109e..57e4468a8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java @@ -182,8 +182,7 @@ public class ScreenGrabber { * * @param saveDirPath to save folder */ - public void takeGamePreview(final Path saveDirPath) - { + public void takeGamePreview(final Path saveDirPath) { this.savingGamePreview = true; this.savedGamePath = GamePreviewImageProvider.getNextGamePreviewImagePath(saveDirPath); this.saveScreenshot(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java index 2257b9916..d601ae5d4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java @@ -36,7 +36,8 @@ public final class ChunkTessellator { final Stopwatch watch = Stopwatch.createStarted(); - // The mesh extends into the borders in the horizontal directions, but not vertically upwards, in order to cover gaps between LOD chunks of different scales, but also avoid multiple overlapping ocean surfaces. + // The mesh extends into the borders in the horizontal directions, but not vertically upwards, in order to cover + // gaps between LOD chunks of different scales, but also avoid multiple overlapping ocean surfaces. for (int x = 0; x < Chunks.SIZE_X; x++) { for (int z = 0; z < Chunks.SIZE_Z; z++) { for (int y = 0; y < Chunks.SIZE_Y - border * 2; y++) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java index 9989a9a73..38cf00dd3 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java @@ -4,8 +4,6 @@ package org.terasology.engine.rendering.primitives; import org.terasology.gestalt.module.sandbox.API; -/** - */ @API public enum ChunkVertexFlag { NORMAL(0, "BLOCK_HINT_NORMAL"), diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java index 522fe7b28..a8ce3c93c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java @@ -19,7 +19,7 @@ public class Sphere { private boolean textureFlag = false; /** - * draws a sphere of the given radius centered around the origin. The sphere is subdivided around the z axis into + * draws a sphere of the given radius centered around the origin. The sphere is subdivided around the z axis into * slices and along the z axis into stacks (similar to lines of longitude and latitude). *

* If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then any normals generated point away @@ -30,10 +30,25 @@ public class Sphere { * +y axis, to 0.25 at the +x axis, to 0.5 at the -y axis, to 0.75 at the -x axis, and back to 1.0 at the +y axis. */ public void draw(float radius, int slices, int stacks) { - float rho, drho, theta, dtheta; - float x, y, z; - float s, t, ds, dt; - int i, j, imin, imax; + float rho; + float drho; + float theta; + float dtheta; + + float x; + float y; + float z; + + float s; + float t; + float ds; + float dt; + + int i; + int j; + int imin; + int imax; + float nsign; nsign = 1.0f; @@ -121,8 +136,11 @@ public class Sphere { this.textureFlag = textureFlag; } + @SuppressWarnings("checkstyle:MethodName") private void TXTR_COORD(float x, float y) { - if (textureFlag) glTexCoord2f(x, y); + if (textureFlag) { + glTexCoord2f(x, y); + } } private float sin(float r) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorld.java b/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorld.java index 127a23cae..9ad1e31d4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorld.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorld.java @@ -9,9 +9,7 @@ import org.terasology.engine.rendering.world.viewDistance.ViewDistance; import org.terasology.engine.world.block.BlockRegion; import org.terasology.engine.world.chunks.ChunkProvider; -/** - * - */ + public interface RenderableWorld { void onChunkLoaded(Vector3ic chunkPosition); diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorldImpl.java b/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorldImpl.java index a258b29e7..c400ef6fd 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorldImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorldImpl.java @@ -13,15 +13,13 @@ import org.slf4j.LoggerFactory; import org.terasology.engine.config.Config; import org.terasology.engine.config.RenderingConfig; import org.terasology.engine.context.Context; +import org.terasology.engine.monitoring.PerformanceMonitor; +import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.cameras.Camera; import org.terasology.engine.rendering.logic.ChunkMeshRenderer; import org.terasology.engine.rendering.primitives.ChunkMesh; import org.terasology.engine.rendering.primitives.ChunkTessellator; import org.terasology.engine.rendering.world.viewDistance.ViewDistance; -import org.terasology.joml.geom.AABBfc; -import org.terasology.math.TeraMath; -import org.terasology.engine.monitoring.PerformanceMonitor; -import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.world.ChunkView; import org.terasology.engine.world.WorldProvider; import org.terasology.engine.world.block.BlockRegion; @@ -32,6 +30,8 @@ import org.terasology.engine.world.chunks.LodChunkProvider; import org.terasology.engine.world.chunks.RenderableChunk; import org.terasology.engine.world.generator.ScalableWorldGenerator; import org.terasology.engine.world.generator.WorldGenerator; +import org.terasology.joml.geom.AABBfc; +import org.terasology.math.TeraMath; import java.util.ArrayList; import java.util.Collections; @@ -47,12 +47,14 @@ class RenderableWorldImpl implements RenderableWorld { private static final int MAX_ANIMATED_CHUNKS = 64; private static final int MAX_BILLBOARD_CHUNKS = 64; - private static final int MAX_LOADABLE_CHUNKS = ViewDistance.MEGA.getChunkDistance().x() * ViewDistance.MEGA.getChunkDistance().y() * ViewDistance.MEGA.getChunkDistance().z(); + private static final int MAX_LOADABLE_CHUNKS = + ViewDistance.MEGA.getChunkDistance().x() * ViewDistance.MEGA.getChunkDistance().y() * ViewDistance.MEGA.getChunkDistance().z(); private static final Vector3fc CHUNK_CENTER_OFFSET = new Vector3f(Chunks.CHUNK_SIZE).div(2); private static final Logger logger = LoggerFactory.getLogger(RenderableWorldImpl.class); - private final int maxChunksForShadows = TeraMath.clamp(CoreRegistry.get(Config.class).getRendering().getMaxChunksUsedForShadowMapping(), 64, 1024); + private final int maxChunksForShadows = + TeraMath.clamp(CoreRegistry.get(Config.class).getRendering().getMaxChunksUsedForShadowMapping(), 64, 1024); private final WorldProvider worldProvider; private ChunkProvider chunkProvider; @@ -87,12 +89,15 @@ class RenderableWorldImpl implements RenderableWorld { this.playerCamera = playerCamera; WorldGenerator worldGenerator = context.get(WorldGenerator.class); if (worldGenerator instanceof ScalableWorldGenerator) { - lodChunkProvider = new LodChunkProvider(context, (ScalableWorldGenerator) worldGenerator, chunkTessellator, renderingConfig.getViewDistance(), (int) renderingConfig.getChunkLods(), calcCameraCoordinatesInChunkUnits()); + lodChunkProvider = new LodChunkProvider(context, (ScalableWorldGenerator) worldGenerator, + chunkTessellator, renderingConfig.getViewDistance(), (int) renderingConfig.getChunkLods(), + calcCameraCoordinatesInChunkUnits()); } else { lodChunkProvider = null; } - renderQueues = new RenderQueuesHelper(new PriorityQueue<>(MAX_LOADABLE_CHUNKS, new ChunkFrontToBackComparator()), + renderQueues = new RenderQueuesHelper(new PriorityQueue<>(MAX_LOADABLE_CHUNKS, + new ChunkFrontToBackComparator()), new PriorityQueue<>(MAX_LOADABLE_CHUNKS, new ChunkFrontToBackComparator()), new PriorityQueue<>(MAX_LOADABLE_CHUNKS, new ChunkFrontToBackComparator()), new PriorityQueue<>(MAX_LOADABLE_CHUNKS, new ChunkFrontToBackComparator()), @@ -251,7 +256,8 @@ class RenderableWorldImpl implements RenderableWorld { logger.info("New Viewing Distance: {}", newViewDistance); currentViewDistance = newViewDistance; if (lodChunkProvider != null) { - lodChunkProvider.updateRenderableRegion(newViewDistance, chunkLods, calcCameraCoordinatesInChunkUnits()); + lodChunkProvider.updateRenderableRegion(newViewDistance, chunkLods, + calcCameraCoordinatesInChunkUnits()); } return updateChunksInProximity(calculateRenderableRegion(newViewDistance)); } else { @@ -262,7 +268,8 @@ class RenderableWorldImpl implements RenderableWorld { private BlockRegion calculateRenderableRegion(ViewDistance newViewDistance) { Vector3i cameraCoordinates = calcCameraCoordinatesInChunkUnits(); Vector3ic renderableRegionSize = newViewDistance.getChunkDistance(); - Vector3i renderableRegionExtents = new Vector3i(renderableRegionSize.x() / 2, renderableRegionSize.y() / 2, renderableRegionSize.z() / 2); + Vector3i renderableRegionExtents = new Vector3i(renderableRegionSize.x() / 2, renderableRegionSize.y() / 2, + renderableRegionSize.z() / 2); return new BlockRegion(cameraCoordinates).expand(renderableRegionExtents); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererImpl.java b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererImpl.java index 1de5051c3..758d19654 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererImpl.java @@ -52,14 +52,15 @@ import static org.lwjgl.opengl.GL11.glViewport; /** - * Renders the 3D world, including background, overlays and first person/in hand objects. 2D UI elements are dealt with elsewhere. + * Renders the 3D world, including background, overlays and first person/in hand objects. 2D UI elements are dealt with + * elsewhere. *

* This implementation includes support for OpenVR, through which HTC Vive and Oculus Rift is supported. *

* This implementation works closely with a number of support objects, in particular: *

- * TODO: update this section to include new, relevant objects - * - a RenderableWorld instance, providing acceleration structures caching blocks requiring different rendering treatments
+ * TODO: update this section to include new, relevant objects - a RenderableWorld instance, providing acceleration + * structures caching blocks requiring different rendering treatments
*/ public final class WorldRendererImpl implements WorldRenderer { /* @@ -103,17 +104,17 @@ public final class WorldRendererImpl implements WorldRenderer { /** * Instantiates a WorldRenderer implementation. *

- * This particular implementation works as deferred shader. The scene is rendered multiple times per frame - * in a number of separate passes (each stored in GPU buffers) and the passes are combined throughout the - * rendering pipeline to calculate per-pixel lighting and other effects. + * This particular implementation works as deferred shader. The scene is rendered multiple times per frame in a + * number of separate passes (each stored in GPU buffers) and the passes are combined throughout the rendering + * pipeline to calculate per-pixel lighting and other effects. *

- * Transparencies are handled through alpha rejection (i.e. ground plants) and alpha-based blending. - * An exception to this is water, which is handled separately to allow for reflections and refractions, if enabled. + * Transparencies are handled through alpha rejection (i.e. ground plants) and alpha-based blending. An exception to + * this is water, which is handled separately to allow for reflections and refractions, if enabled. *

- * By the time it is fully instantiated this implementation is already connected to all the support objects - * it requires and is ready to render via the render(RenderingStage) method. + * By the time it is fully instantiated this implementation is already connected to all the support objects it + * requires and is ready to render via the render(RenderingStage) method. * - * @param context a context object, to obtain instances of classes such as the rendering config. + * @param context a context object, to obtain instances of classes such as the rendering config. */ public WorldRendererImpl(Context context) { this.context = context; @@ -172,7 +173,8 @@ public final class WorldRendererImpl implements WorldRenderer { ScreenGrabber screenGrabber = new ScreenGrabber(context); context.put(ScreenGrabber.class, screenGrabber); - displayResolutionDependentFbo = new DisplayResolutionDependentFbo(context.get(Config.class).getRendering(), screenGrabber, context.get(DisplayDevice.class)); + displayResolutionDependentFbo = new DisplayResolutionDependentFbo( + context.get(Config.class).getRendering(), screenGrabber, context.get(DisplayDevice.class)); context.put(DisplayResolutionDependentFbo.class, displayResolutionDependentFbo); shaderManager.initShaders(); @@ -198,7 +200,8 @@ public final class WorldRendererImpl implements WorldRenderer { context.get(ModuleManager.class).getEnvironment(), context); if (renderingModules.isEmpty()) { GameEngine gameEngine = context.get(GameEngine.class); - gameEngine.changeState(new StateMainMenu("No rendering module loaded, unable to render. Try enabling CoreRendering.")); + gameEngine.changeState(new StateMainMenu("No rendering module loaded, unable to render. Try enabling " + + "CoreRendering.")); } } else { // registry populated by new ModuleRendering instances in UI // Switch module's context from gamecreation subcontext to gamerunning context @@ -215,8 +218,8 @@ public final class WorldRendererImpl implements WorldRenderer { for (ModuleRendering moduleRenderingInstance : renderingModuleRegistry.getOrderedRenderingModules()) { if (moduleRenderingInstance.isEnabled()) { logger.info(String.format("\nInitialising rendering class %s from %s module.\n", - moduleRenderingInstance.getClass().getSimpleName(), - moduleRenderingInstance.getProvidingModule())); + moduleRenderingInstance.getClass().getSimpleName(), + moduleRenderingInstance.getProvidingModule())); moduleRenderingInstance.initialise(); } } @@ -286,7 +289,8 @@ public final class WorldRendererImpl implements WorldRenderer { // this is done to execute this code block only once per frame // instead of once per eye in a stereo setup. if (isFirstRenderingStageForCurrentFrame) { - timeSmoothedMainLightIntensity = TeraMath.lerp(timeSmoothedMainLightIntensity, getMainLightIntensityAt(playerCamera.getPosition()), secondsSinceLastFrame); + timeSmoothedMainLightIntensity = TeraMath.lerp(timeSmoothedMainLightIntensity, + getMainLightIntensityAt(playerCamera.getPosition()), secondsSinceLastFrame); playerCamera.update(secondsSinceLastFrame); @@ -296,7 +300,8 @@ public final class WorldRendererImpl implements WorldRenderer { displayResolutionDependentFbo.update(); - millisecondsSinceRenderingStart += secondsSinceLastFrame * 1000; // updates the variable animations are based on. + millisecondsSinceRenderingStart += secondsSinceLastFrame * 1000; // updates the variable animations are + // based on. } if (currentRenderingStage != RenderingStage.MONO) { @@ -314,18 +319,18 @@ public final class WorldRendererImpl implements WorldRenderer { } /** - * TODO: update javadocs - * This method triggers the execution of the rendering pipeline and, eventually, sends the output to the display - * or to a file, when grabbing a screenshot. + * TODO: update javadocs This method triggers the execution of the rendering pipeline and, eventually, sends the + * output to the display or to a file, when grabbing a screenshot. *

* In this particular implementation this method can be called once per frame, when rendering to a standard display, * or twice, each time with a different rendering stage, when rendering to the head mounted display. *

- * PerformanceMonitor.startActivity/endActivity statements are used in this method and in those it executes, - * to provide statistics regarding the ongoing rendering and its individual steps (i.e. rendering shadows, - * reflections, 2D filters...). + * PerformanceMonitor.startActivity/endActivity statements are used in this method and in those it executes, to + * provide statistics regarding the ongoing rendering and its individual steps (i.e. rendering shadows, reflections, + * 2D filters...). * - * @param renderingStage "MONO" for standard rendering and "LEFT_EYE" or "RIGHT_EYE" for stereoscopic displays. + * @param renderingStage "MONO" for standard rendering and "LEFT_EYE" or "RIGHT_EYE" for stereoscopic + * displays. */ @Override public void render(RenderingStage renderingStage) { @@ -394,13 +399,15 @@ public final class WorldRendererImpl implements WorldRenderer { float rawLightValueSun = worldProvider.getSunlight(pos) / 15.0f; float rawLightValueBlock = worldProvider.getLight(pos) / 15.0f; - float lightValueSun = (float) Math.pow(BLOCK_LIGHT_SUN_POW, (1.0f - rawLightValueSun) * 16.0) * rawLightValueSun; + float lightValueSun = + (float) Math.pow(BLOCK_LIGHT_SUN_POW, (1.0f - rawLightValueSun) * 16.0) * rawLightValueSun; lightValueSun *= backdropProvider.getDaylight(); // TODO: Hardcoded factor and value to compensate for daylight tint and night brightness lightValueSun *= 0.9f; lightValueSun += 0.05f; - float lightValueBlock = (float) Math.pow(BLOCK_LIGHT_POW, (1.0f - (double) rawLightValueBlock) * 16.0f) * rawLightValueBlock * BLOCK_INTENSITY_FACTOR; + float lightValueBlock = + (float) Math.pow(BLOCK_LIGHT_POW, (1.0f - (double) rawLightValueBlock) * 16.0f) * rawLightValueBlock * BLOCK_INTENSITY_FACTOR; return Math.max(lightValueBlock, lightValueSun); } @@ -452,12 +459,13 @@ public final class WorldRendererImpl implements WorldRenderer { } /** - * Forces a recompilation of all shaders. This command, backed by Gestalt's monitoring feature, - * allows developers to hot-swap shaders for easy development. - * + * Forces a recompilation of all shaders. This command, backed by Gestalt's monitoring feature, allows developers to + * hot-swap shaders for easy development. + *

* To run the command simply type "recompileShaders" and then press Enter in the console. */ - @Command(shortDescription = "Forces a recompilation of shaders.", requiredPermission = PermissionManager.NO_PERMISSION) + @Command(shortDescription = "Forces a recompilation of shaders.", requiredPermission = + PermissionManager.NO_PERMISSION) public void recompileShaders() { console.addMessage("Recompiling shaders... ", false); shaderManager.recompileAllShaders(); @@ -467,15 +475,14 @@ public final class WorldRendererImpl implements WorldRenderer { /** * Acts as an interface between the console and the Nodes. All parameters passed to command are redirected to the * concerned Nodes, which in turn take care of executing them. - * - * Usage: - * dagNodeCommand - * - * Example: - * dagNodeCommand engine:outputToScreenNode setFbo engine:fbo.ssao + *

+ * Usage: dagNodeCommand + *

+ * Example: dagNodeCommand engine:outputToScreenNode setFbo engine:fbo.ssao */ @Command(shortDescription = "Debugging command for DAG.", requiredPermission = PermissionManager.NO_PERMISSION) - public void dagNodeCommand(@CommandParam("nodeUri") final String nodeUri, @CommandParam("command") final String command, + public void dagNodeCommand(@CommandParam("nodeUri") final String nodeUri, + @CommandParam("command") final String command, @CommandParam(value = "arguments") final String... arguments) { Node node = renderGraph.findNode(nodeUri); if (node == null) { @@ -489,24 +496,25 @@ public final class WorldRendererImpl implements WorldRenderer { /** * Redirect output FBO from one node to another's input - * - * Usage: - * dagRedirect - * - * Example: - * dagRedirect fbo blurredAmbientOcclusion 1 BasicRendering:outputToScreenNode 1 - * dagRedirect bufferpair backdrop 1 AdvancedRendering:intermediateHazeNode 1 + *

+ * Usage: dagRedirect + *

+ * Example: dagRedirect fbo blurredAmbientOcclusion 1 BasicRendering:outputToScreenNode 1 dagRedirect bufferpair + * backdrop 1 AdvancedRendering:intermediateHazeNode 1 */ @Command(shortDescription = "Debugging command for DAG.", requiredPermission = PermissionManager.NO_PERMISSION) - public void dagRedirect(@CommandParam("fromNodeUri") final String connectionTypeString, @CommandParam("fromNodeUri") final String fromNodeUri, @CommandParam("outputFboId") final int outputFboId, - @CommandParam("toNodeUri") final String toNodeUri, @CommandParam(value = "inputFboId") final int inputFboId) { + public void dagRedirect(@CommandParam("fromNodeUri") final String connectionTypeString, @CommandParam( + "fromNodeUri") final String fromNodeUri, @CommandParam("outputFboId") final int outputFboId, + @CommandParam("toNodeUri") final String toNodeUri, + @CommandParam(value = "inputFboId") final int inputFboId) { RenderGraph.ConnectionType connectionType; - if(connectionTypeString.equalsIgnoreCase("fbo")) { + if (connectionTypeString.equalsIgnoreCase("fbo")) { connectionType = RenderGraph.ConnectionType.FBO; } else if (connectionTypeString.equalsIgnoreCase("bufferpair")) { connectionType = RenderGraph.ConnectionType.BUFFER_PAIR; } else { - throw new RuntimeException(("Unsupported connection type: '" + connectionTypeString + "'. Expected 'fbo' or 'bufferpair'.\n")); + throw new RuntimeException(("Unsupported connection type: '" + connectionTypeString + "'. Expected 'fbo' " + + "or 'bufferpair'.\n")); } Node toNode = renderGraph.findNode(toNodeUri); @@ -524,9 +532,9 @@ public final class WorldRendererImpl implements WorldRenderer { throw new RuntimeException(("No node is associated with URI '" + fromNodeUri + "'")); } } - renderGraph.reconnectInputToOutput(fromNode, outputFboId, toNode, inputFboId, connectionType, true); - toNode.clearDesiredStateChanges(); - requestTaskListRefresh(); + renderGraph.reconnectInputToOutput(fromNode, outputFboId, toNode, inputFboId, connectionType, true); + toNode.clearDesiredStateChanges(); + requestTaskListRefresh(); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java index ca588a95e..c80397a13 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java @@ -12,8 +12,6 @@ import org.terasology.engine.world.WorldComponent; import org.terasology.engine.world.chunks.event.BeforeChunkUnload; import org.terasology.engine.world.chunks.event.OnChunkLoaded; -/** - */ @RegisterSystem(RegisterMode.CLIENT) public class WorldRendererSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java index 396e20048..f6b769688 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java @@ -5,35 +5,28 @@ package org.terasology.engine.rendering.world.selection; import org.joml.Matrix4f; import org.joml.Vector2f; import org.joml.Vector3f; -import org.joml.Vector3i; import org.joml.Vector3ic; import org.joml.Vector4f; import org.lwjgl.opengl.GL11; +import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.assets.material.Material; +import org.terasology.engine.rendering.assets.mesh.Mesh; import org.terasology.engine.rendering.assets.shader.ShaderProgramFeature; import org.terasology.engine.rendering.assets.texture.Texture; import org.terasology.engine.rendering.assets.texture.TextureRegionAsset; import org.terasology.engine.rendering.cameras.Camera; import org.terasology.engine.rendering.primitives.Tessellator; import org.terasology.engine.rendering.primitives.TessellatorHelper; -import org.terasology.joml.geom.Rectanglef; -import org.terasology.gestalt.module.sandbox.API; -import org.terasology.engine.registry.CoreRegistry; -import org.terasology.engine.rendering.assets.mesh.Mesh; import org.terasology.engine.rendering.world.WorldRenderer; import org.terasology.engine.utilities.Assets; +import org.terasology.gestalt.module.sandbox.API; +import org.terasology.joml.geom.Rectanglef; -import static org.lwjgl.opengl.GL11.GL_MODELVIEW; import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.glBindTexture; import static org.lwjgl.opengl.GL11.glBlendFunc; import static org.lwjgl.opengl.GL11.glDisable; import static org.lwjgl.opengl.GL11.glEnable; -import static org.lwjgl.opengl.GL11.glMatrixMode; -import static org.lwjgl.opengl.GL11.glPopMatrix; -import static org.lwjgl.opengl.GL11.glPushMatrix; -import static org.lwjgl.opengl.GL11.glTranslated; /** * Renders a selection. Is used by the BlockSelectionSystem. diff --git a/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java b/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java index 9fdf11a13..77a23c403 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java index 59fa8c7fb..b31bb9b0b 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java @@ -1,32 +1,13 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.engine.context.Context; import org.terasology.engine.core.module.ModuleManager; -import org.terasology.gestalt.module.Module; import org.terasology.gestalt.module.ModuleEnvironment; -import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; -import org.terasology.gestalt.module.dependencyresolution.ResolutionResult; -import org.terasology.gestalt.module.predicates.FromModule; -import org.terasology.gestalt.module.resources.DirectoryFileSource; import org.terasology.gestalt.module.sandbox.API; -import org.terasology.gestalt.naming.Name; import org.terasology.engine.telemetry.metrics.Metric; import java.lang.reflect.Constructor; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java index e5694c4a1..f5b7fa70c 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java index c1144aaad..64fb04d7a 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.snowplowanalytics.snowplow.tracker.emitter.BatchEmitter; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java index 34379ccec..2530553d6 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java index febb4ac1d..f71d3b6bd 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.snowplowanalytics.snowplow.tracker.DevicePlatform; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java index f42d72833..312adbd03 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.google.common.collect.Maps; @@ -33,13 +20,7 @@ import org.terasology.engine.rendering.nui.layers.mainMenu.AddServerPopup; import org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender; import org.terasology.engine.telemetry.metrics.Metric; import org.terasology.gestalt.assets.ResourceUrn; -import org.terasology.gestalt.module.Module; import org.terasology.gestalt.module.ModuleEnvironment; -import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; -import org.terasology.gestalt.module.dependencyresolution.ResolutionResult; -import org.terasology.gestalt.module.predicates.FromModule; -import org.terasology.gestalt.module.resources.DirectoryFileSource; -import org.terasology.gestalt.naming.Name; import org.terasology.nui.WidgetUtil; import org.terasology.nui.databinding.BindHelper; import org.terasology.nui.databinding.Binding; @@ -61,8 +42,8 @@ import java.util.Optional; import java.util.Set; /** - * The metrics menu lists the telemetry field names and values that will be sent to the server. - * Users can enable or disable telemetry function in this menu. + * The metrics menu lists the telemetry field names and values that will be sent to the server. Users can enable or + * disable telemetry function in this menu. */ public class TelemetryScreen extends CoreScreenLayer { @@ -98,12 +79,14 @@ public class TelemetryScreen extends CoreScreenLayer { refreshContent(); WidgetUtil.trySubscribe(this, "back", button -> triggerBackAnimation()); - WidgetUtil.tryBindCheckBoxWithListener(this, "telemetryEnabled", BindHelper.bindBeanProperty("telemetryEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { + WidgetUtil.tryBindCheckBoxWithListener(this, "telemetryEnabled", BindHelper.bindBeanProperty( + "telemetryEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { if (config.getTelemetryConfig().isTelemetryEnabled()) { pushAddServerPopupAndStartEmitter(); } }); - WidgetUtil.tryBindCheckBoxWithListener(this, "errorReportingEnabled", BindHelper.bindBeanProperty("errorReportingEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { + WidgetUtil.tryBindCheckBoxWithListener(this, "errorReportingEnabled", BindHelper.bindBeanProperty( + "errorReportingEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { if (config.getTelemetryConfig().isErrorReportingEnabled()) { pushAddServerPopupAndStartLogBackAppender(); } else { @@ -126,14 +109,16 @@ public class TelemetryScreen extends CoreScreenLayer { } /** - * Add a listener to the telemetryEnable checkbox. If the checkbox os enabled/disabled, it will enable/disable all the telemetry field. + * Add a listener to the telemetryEnable checkbox. If the checkbox os enabled/disabled, it will enable/disable all + * the telemetry field. */ private void addEnablingAllTelemetryListener() { UICheckbox uiCheckbox = this.find("telemetryEnabled", UICheckbox.class); if (uiCheckbox != null) { uiCheckbox.subscribe((checkbox) -> { boolean telemetryEnabled = config.getTelemetryConfig().isTelemetryEnabled(); - Map bindingMap = config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); + Map bindingMap = + config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); for (Map.Entry entry : bindingMap.entrySet()) { entry.setValue(telemetryEnabled); } @@ -144,7 +129,8 @@ public class TelemetryScreen extends CoreScreenLayer { if (categoryBox != null) { categoryBox.setEnabled(telemetryEnabled); } - Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), ReflectionUtils.withAnnotation(TelemetryField.class)); + Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), + ReflectionUtils.withAnnotation(TelemetryField.class)); for (Field field : fields) { String fieldName = telemetryCategory.getKey().id() + ":" + field.getName(); UICheckbox fieldBox = this.find(fieldName, UICheckbox.class); @@ -158,22 +144,24 @@ public class TelemetryScreen extends CoreScreenLayer { } /** - * Add a listener to the checkbox in the telemetry category row. - * If this checkbox is checked, all the sub telemetry fields will be enabled/disabled. + * Add a listener to the checkbox in the telemetry category row. If this checkbox is checked, all the sub telemetry + * fields will be enabled/disabled. */ private void addGroupEnablingListener() { fetchTelemetryCategoriesFromEngineOnlyEnvironment(); - for (Map.Entry telemetryCategory: telemetryCategories.entrySet()) { + for (Map.Entry telemetryCategory : telemetryCategories.entrySet()) { if (!telemetryCategory.getKey().isOneMapMetric()) { UICheckbox uiCheckbox = this.find(telemetryCategory.getKey().id(), UICheckbox.class); if (uiCheckbox == null) { continue; } uiCheckbox.subscribe((checkbox) -> { - Map bindingMap = config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); + Map bindingMap = + config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); if (bindingMap.containsKey(telemetryCategory.getKey().id())) { boolean isGroupEnable = bindingMap.get(telemetryCategory.getKey().id()); - Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), ReflectionUtils.withAnnotation(TelemetryField.class)); + Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), + ReflectionUtils.withAnnotation(TelemetryField.class)); for (Field field : fields) { String fieldName = telemetryCategory.getKey().id() + ":" + field.getName(); bindingMap.put(fieldName, isGroupEnable); @@ -190,7 +178,7 @@ public class TelemetryScreen extends CoreScreenLayer { mainLayout.setVerticalSpacing(8); fetchTelemetryCategoriesFromEngineOnlyEnvironment(); - for (Map.Entry telemetryCategory: telemetryCategories.entrySet()) { + for (Map.Entry telemetryCategory : telemetryCategories.entrySet()) { Class metricClass = telemetryCategory.getValue(); Optional optional = metrics.getMetric(metricClass); if (optional.isPresent()) { @@ -223,11 +211,13 @@ public class TelemetryScreen extends CoreScreenLayer { serverInfo.setOwner(telemetryConfig.getTelemetryServerOwner()); } catch (Exception e) { logger.error("Exception when get telemetry server information", e); - serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); + serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, + TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); serverInfo.setOwner(TelemetryEmitter.DEFAULT_COLLECTOR_OWNER); } } else { - serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); + serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, + TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); serverInfo.setOwner(TelemetryEmitter.DEFAULT_COLLECTOR_OWNER); } addServerPopup.setServerInfo(serverInfo); @@ -255,16 +245,19 @@ public class TelemetryScreen extends CoreScreenLayer { if (telemetryConfig.getErrorReportingDestination() != null) { try { URL url = new URL("http://" + telemetryConfig.getErrorReportingDestination()); - serverInfo = new ServerInfo(telemetryConfig.getErrorReportingServerName(), url.getHost(), url.getPort()); + serverInfo = new ServerInfo(telemetryConfig.getErrorReportingServerName(), url.getHost(), + url.getPort()); serverInfo.setOwner(telemetryConfig.getErrorReportingServerOwner()); } catch (Exception e) { logger.error("Exception when get telemetry server information", e); - serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, + serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, + TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT); serverInfo.setOwner(TelemetryLogstashAppender.DEFAULT_LOGSTASH_OWNER); } } else { - serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, + serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, + TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT); serverInfo.setOwner(TelemetryLogstashAppender.DEFAULT_LOGSTASH_OWNER); } @@ -300,6 +293,7 @@ public class TelemetryScreen extends CoreScreenLayer { /** * Add a new section with represents a new metrics type. + * * @param telemetryCategory the annotation of the new metric * @param layout the layout where the new section will be added * @param map the map which includes the telemetry field name and value @@ -337,6 +331,7 @@ public class TelemetryScreen extends CoreScreenLayer { /** * Get a binding to a map boolean value. + * * @param bindingMap the map. * @param fieldName the key associate to the binding value in the map. * @return @@ -357,18 +352,21 @@ public class TelemetryScreen extends CoreScreenLayer { /** * Add a new row in the menu, the new row includes the field name and value. + * * @param type the type(name) of the this field * @param value the value of this field * @param layout the layout where the new line will be added * @param isWithCheckbox whether add a check box in the line * @param telemetryCategory the TelemetryCategory that this field belongs to */ - private void addTelemetryField(String type, Object value, ColumnLayout layout, boolean isWithCheckbox, TelemetryCategory telemetryCategory) { + private void addTelemetryField(String type, Object value, ColumnLayout layout, boolean isWithCheckbox, + TelemetryCategory telemetryCategory) { RowLayout newRow; if (isWithCheckbox) { String fieldName = telemetryCategory.id() + ":" + type; UICheckbox uiCheckbox = new UICheckbox(fieldName); - Map bindingMap = config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); + Map bindingMap = + config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); if (!bindingMap.containsKey(fieldName)) { bindingMap.put(fieldName, config.getTelemetryConfig().isTelemetryEnabled()); } @@ -378,7 +376,8 @@ public class TelemetryScreen extends CoreScreenLayer { if (bindingMap.get(fieldName)) { bindingMap.put(telemetryCategory.id(), true); } else { - Set fields = ReflectionUtils.getFields(telemetryCategories.get(telemetryCategory), ReflectionUtils.withAnnotation(TelemetryField.class)); + Set fields = ReflectionUtils.getFields(telemetryCategories.get(telemetryCategory), + ReflectionUtils.withAnnotation(TelemetryField.class)); boolean isOneEnabled = false; for (Field field : fields) { isOneEnabled = isOneEnabled || bindingMap.get(telemetryCategory.id() + ":" + field.getName()); @@ -401,14 +400,16 @@ public class TelemetryScreen extends CoreScreenLayer { } /** - * If the field value is a list, then will add more than one rows. - * Each new line includes the field name with index and its value. + * If the field value is a list, then will add more than one rows. Each new line includes the field name with index + * and its value. + * * @param type the type(name) of the this field * @param value the value of this field (a List) * @param layout the layout where the new line will be added * @param isWithCheckbox whether add a check box in the line */ - private void addTelemetryField(String type, List value, ColumnLayout layout, boolean isWithCheckbox, TelemetryCategory telemetryCategory) { + private void addTelemetryField(String type, List value, ColumnLayout layout, boolean isWithCheckbox, + TelemetryCategory telemetryCategory) { int moduleCount = 1; for (Object o : value) { StringBuilder sb = new StringBuilder(); @@ -422,6 +423,7 @@ public class TelemetryScreen extends CoreScreenLayer { /** * Sorts the fields by the name of each fields. + * * @param map the map that will be sorted * @return a list of map entry that is ordered by fields' names */ diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java index d663c4ef2..e38f002fa 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.snowplowanalytics.snowplow.tracker.emitter.Emitter; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java index 1f9aa9d02..d2fca5268 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import ch.qos.logback.classic.LoggerContext; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java index ab3d59bbd..56c068ff7 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java index 1ec8958d9..ffb29158d 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java index 432881169..1abe75463 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import ch.qos.logback.classic.LoggerContext; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java index 4ee98e211..d56b3f4ce 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java index d6385c458..7b7255c72 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java index 7b458f2ac..76d63fec8 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java index a885f67e6..795985f14 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java index 14b45eb7c..deaa96b3d 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java index 129da58ac..b1fabf55d 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java index 003e28aec..8a2b346de 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java index 932cf7924..ffba1048d 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java b/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java index 8ea8b0327..19f0e6bee 100644 --- a/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java +++ b/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.unicode; diff --git a/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java b/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java index 12ed7c60c..0ec9d6956 100644 --- a/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java +++ b/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.unicode; diff --git a/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java b/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java index eab984f19..eee869c10 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java +++ b/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java @@ -10,8 +10,6 @@ import java.nio.file.Path; import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; -/** - */ public final class FilesUtil { /** diff --git a/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java b/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java index 0bc59a6a4..105068231 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java +++ b/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java @@ -6,8 +6,6 @@ package org.terasology.engine.utilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - */ public final class NativeHelper { private static final Logger logger = LoggerFactory.getLogger(NativeHelper.class); diff --git a/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java b/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java index c371e25df..a009102d9 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java +++ b/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java @@ -33,9 +33,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -/** - * - */ + public final class ReflectionUtil { private ReflectionUtil() { } diff --git a/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java b/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java index 8a8b28757..2151da4da 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java +++ b/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java @@ -5,8 +5,6 @@ package org.terasology.engine.utilities.collection; import java.util.Iterator; import java.util.NoSuchElementException; -/** - */ public class CharSequenceIterator implements Iterator { private final CharSequence sequence; diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java index e9b2f15d0..f14c638b1 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java +++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java @@ -3,8 +3,6 @@ package org.terasology.engine.utilities.concurrency; -/** - */ public abstract class AbstractTask implements Task { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java index 3a1b1eb22..3175d12c0 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java +++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.utilities.concurrency; -/** - */ public class ShutdownTask implements Task { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java index da0ec4305..b0e55dc1a 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java +++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java @@ -11,8 +11,6 @@ import org.terasology.engine.monitoring.ThreadMonitor; import java.util.concurrent.BlockingQueue; -/** - */ final class TaskProcessor implements Runnable { private static final Logger logger = LoggerFactory.getLogger(TaskProcessor.class); diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java index 11f43c4e6..4aa48906b 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java @@ -11,8 +11,6 @@ import org.terasology.gestalt.assets.Asset; import java.lang.reflect.Type; -/** - */ public class AssetTypeAdapter implements JsonDeserializer { private Class type; diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java b/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java index 64c21c710..535a3c051 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java @@ -15,8 +15,6 @@ import org.terasology.input.InputType; import java.lang.reflect.Type; -/** - */ public class InputHandler implements JsonSerializer, JsonDeserializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java index 63238a46a..02003d099 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java @@ -12,8 +12,6 @@ import org.joml.Quaternionf; import java.lang.reflect.Type; -/** - */ public class QuaternionfTypeAdapter implements JsonDeserializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java index 927d9cfcb..ce42931d3 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java @@ -21,8 +21,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -/** - */ public class SetMultimapTypeAdapter implements JsonDeserializer>, JsonSerializer> { private Class valueType; diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java index 6c6cc460f..024e04934 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java @@ -12,8 +12,6 @@ import org.joml.Vector2f; import java.lang.reflect.Type; -/** - */ public class Vector2fTypeAdapter implements JsonDeserializer { @Override public Vector2f deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java index b55d4160e..173f73a4b 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java @@ -12,8 +12,6 @@ import org.joml.Vector2i; import java.lang.reflect.Type; -/** - */ public class Vector2iTypeAdapter implements JsonDeserializer { @Override public Vector2i deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java index b84ab740e..d44fe157f 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java @@ -12,8 +12,6 @@ import org.joml.Vector3f; import java.lang.reflect.Type; -/** - */ public class Vector3fTypeAdapter implements JsonDeserializer { @Override public Vector3f deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java index 855917282..6906a0086 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java @@ -12,8 +12,6 @@ import org.joml.Vector4f; import java.lang.reflect.Type; -/** - */ public class Vector4fTypeAdapter implements JsonDeserializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java b/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java index 89f03dc68..d710ef848 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java +++ b/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java @@ -8,8 +8,6 @@ import org.joml.Vector2f; import java.util.Random; -/** - */ public class Voronoi { private static final float DENSITY_ADJUSTMENT = 0.39815f; diff --git a/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java b/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java index 36c03c26a..5a5943de8 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java +++ b/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.utilities.reflection; -/** - */ import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java b/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java index 01ea0a56f..175eadc7b 100644 --- a/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java +++ b/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java @@ -5,8 +5,6 @@ package org.terasology.engine.world; import org.joml.Vector3i; import org.terasology.engine.entitySystem.Component; -/** - */ public class RelevanceRegionComponent implements Component { public Vector3i distance = new Vector3i(1, 1, 1); diff --git a/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java b/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java index e907a3c23..88e044179 100644 --- a/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java +++ b/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java @@ -6,8 +6,6 @@ package org.terasology.engine.world; import org.joml.Vector3ic; import org.terasology.engine.world.block.Block; -/** - */ public interface WorldChangeListener { void onBlockChanged(Vector3ic pos, Block newBlock, Block originalBlock); diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java b/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java index adadefd0a..0dcbc010e 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java @@ -33,15 +33,17 @@ public interface BlockBuilderHelper { Block constructSimpleBlock(BlockFamilyDefinition definition, String section, BlockUri uri, BlockFamily blockFamily); /** - * Constructs a basic block from the data provided. This block is assumed to have no rotations, and to use reasonable defaults - * The block is registered into the engine as to be directly usable + * Constructs a basic block from the data provided. This block is assumed to have no rotations, and to use + * reasonable defaults The block is registered into the engine as to be directly usable *

- * For blocks that contain rotations or that use custom values see {@link #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily)} and {@link #constructCustomBlock(String, BlockShape, Rotation, SectionDefinitionData, BlockUri, BlockFamily)} + * For blocks that contain rotations or that use custom values see + * {@link #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily)} and + * {@link #constructCustomBlock(String, BlockShape, Rotation, SectionDefinitionData, BlockUri, BlockFamily)} * - * @param definition The definition for the block family this block should belong to - * @param shape The shape this block should be displayed with - * @param section The block family subsection this block will represent - * @param uri The URI to use for the block + * @param definition The definition for the block family this block should belong to + * @param shape The shape this block should be displayed with + * @param section The block family subsection this block will represent + * @param uri The URI to use for the block * @param blockFamily The block family instance this block will belong to * @return The constructed and registered block */ diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java b/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java index 08fb42366..419be1e4b 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -/** - */ public class BlockExplorer { private AssetManager assetManager; diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java b/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java index 5350a2452..6a246be8e 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java @@ -12,8 +12,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.NoSuchElementException; -/** - */ //FIXME: There is a mismatch between `blockCount` and iterated blocks. // I don't get what this event is about, and how it should behave. The `TIntList positions` is a flattened list // of positions. So if this event affects diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java b/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java index e442e6fb6..900f90c74 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java @@ -8,8 +8,6 @@ import org.terasology.engine.world.block.family.BlockFamily; import java.util.Collection; import java.util.Map; -/** - */ public abstract class BlockManager { public static final BlockUri AIR_ID = new BlockUri(new ResourceUrn("engine:air")); diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java b/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java index 567ae72f0..7022fb028 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java @@ -10,8 +10,6 @@ import org.terasology.engine.math.Side; import java.util.EnumMap; import java.util.List; -/** - */ public enum BlockPart { TOP(Side.TOP), LEFT(Side.LEFT), diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java b/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java index 626b5831d..4bad4bb3f 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.block; -/** - */ public class BlockUriParseException extends RuntimeException { private static final long serialVersionUID = 5571599578432666018L; diff --git a/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java b/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java index f9aa57798..853c236ab 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java +++ b/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java @@ -7,8 +7,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface ForceBlockActive { diff --git a/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java b/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java index 2af1789fd..3c2509ce7 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java +++ b/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java @@ -7,8 +7,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RequiresBlockLifecycleEvents { diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java b/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java index e16f3ba53..36390c037 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java @@ -7,8 +7,6 @@ import org.terasology.engine.entitySystem.Component; import java.util.Map; -/** - */ public class BlockDamageModifierComponent implements Component { public Map materialDamageMultiplier = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java index ae306b7cf..897d9d1d5 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java @@ -4,7 +4,5 @@ package org.terasology.engine.world.block.entity.neighbourUpdate; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class LargeBlockUpdateFinished implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java index 7de175ad0..7d94aca71 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java @@ -4,7 +4,5 @@ package org.terasology.engine.world.block.entity.neighbourUpdate; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class LargeBlockUpdateStarting implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java index f9b3a564a..104618e88 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java @@ -12,8 +12,6 @@ import org.terasology.engine.registry.In; import org.terasology.engine.world.WorldComponent; import org.terasology.engine.world.WorldProvider; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class BlockPlacingSystem extends BaseComponentSystem { @In diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java index 8d29addf2..a90131847 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java @@ -11,8 +11,6 @@ import org.terasology.engine.world.block.Block; import java.util.Collections; import java.util.Map; -/** - */ public class PlaceBlocks extends AbstractConsumableEvent { private Map blocks; private EntityRef instigator; diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java b/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java index b57c7cc83..103bc9236 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java +++ b/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java @@ -4,10 +4,12 @@ package org.terasology.engine.world.block.family; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.context.Context; +import org.terasology.engine.registry.InjectionHelper; +import org.terasology.engine.world.block.BlockBuilderHelper; import org.terasology.engine.world.block.loader.BlockFamilyDefinition; import org.terasology.engine.world.block.shapes.BlockShape; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.module.ModuleEnvironment; import org.terasology.gestalt.util.reflection.ParameterProvider; import org.terasology.gestalt.util.reflection.SimpleClassFactory; @@ -16,8 +18,6 @@ import org.terasology.reflection.metadata.ClassLibrary; import org.terasology.reflection.metadata.ClassMetadata; import org.terasology.reflection.metadata.DefaultModuleClassLibrary; import org.terasology.reflection.reflect.ReflectFactory; -import org.terasology.engine.registry.InjectionHelper; -import org.terasology.engine.world.block.BlockBuilderHelper; import java.util.Optional; @@ -72,7 +72,9 @@ public class BlockFamilyLibrary { * @param blockBuilderHelper * @return */ - public static BlockFamily createFamily(Class blockFamily, BlockFamilyDefinition blockFamilyDefinition, BlockBuilderHelper blockBuilderHelper) { + public static BlockFamily createFamily(Class blockFamily, + BlockFamilyDefinition blockFamilyDefinition, + BlockBuilderHelper blockBuilderHelper) { try { SimpleClassFactory simpleClassFactory = new SimpleClassFactory(new ParameterProvider() { @Override @@ -107,7 +109,9 @@ public class BlockFamilyLibrary { * @param shape * @return new BlockFamily */ - public static BlockFamily createFamily(Class blockFamily, BlockFamilyDefinition blockFamilyDefinition, BlockShape shape, BlockBuilderHelper blockBuilderHelper) { + public static BlockFamily createFamily(Class blockFamily, + BlockFamilyDefinition blockFamilyDefinition, BlockShape shape, + BlockBuilderHelper blockBuilderHelper) { try { SimpleClassFactory simpleClassFactory = new SimpleClassFactory(new ParameterProvider() { @Override diff --git a/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java b/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java index abc03dd6e..346e5377f 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java +++ b/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java @@ -12,8 +12,6 @@ import org.terasology.engine.world.block.family.BlockFamily; import java.util.Optional; -/** - */ public class BlockPrefabManager implements BlockRegistrationListener { private EntityManager entityManager; diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java index bc8d88c91..f1b44e65a 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.block.loader; import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.gestalt.module.sandbox.API; -/** - */ @API public class EntityData { private Prefab prefab; diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java index d74ff14d0..18c867b80 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.block.loader; import org.terasology.gestalt.module.sandbox.API; -/** - */ @API public class InventoryData { private boolean directPickup; diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java index b0c0f8d15..308af84c9 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java @@ -12,8 +12,6 @@ import org.terasology.engine.world.block.tiles.BlockTile; import java.util.EnumMap; -/** - */ @API public class SectionDefinitionData { private String displayName = ""; diff --git a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java index 26554418f..73eb0e717 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java +++ b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java @@ -7,9 +7,7 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.BlockRegion; -/** - * - */ + public class BlockRegionComponent implements Component { /** * May be null. diff --git a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java index e2f57951f..d17d82f1c 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java @@ -14,8 +14,6 @@ import org.terasology.engine.registry.In; import org.terasology.engine.world.WorldProvider; import org.terasology.engine.world.block.BlockManager; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class BlockRegionSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java index e6b73a3a4..14099dac4 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java @@ -11,8 +11,6 @@ import org.terasology.gestalt.assets.AssetData; import java.util.EnumMap; -/** - */ public class BlockShapeData implements AssetData { private String displayName = ""; private EnumMap meshParts = Maps.newEnumMap(BlockPart.class); diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java index eaf0b6453..b37c94f86 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java @@ -18,8 +18,6 @@ import org.terasology.gestalt.assets.ResourceUrn; import java.util.EnumMap; import java.util.Map; -/** - */ public class BlockShapeImpl extends BlockShape { private String displayName; diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java index 2d154c4b3..4b8ee4066 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java @@ -38,8 +38,6 @@ import java.util.Locale; import static org.terasology.engine.physics.engine.PhysicsEngineManager.COLLISION_SHAPE_FACTORY; -/** - */ @RegisterAssetFileFormat public class JsonBlockShapeLoader extends AbstractAssetFileFormat { private Gson gson; diff --git a/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java b/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java index a346d3ce8..8bd5e386e 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java @@ -28,8 +28,6 @@ import java.util.Comparator; import java.util.Map; import java.util.Set; -/** - */ @RegisterSystem @Share(BlockStructuralSupportRegistry.class) public class BlockStructuralSupportSystem extends BaseComponentSystem implements BlockStructuralSupportRegistry { diff --git a/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java b/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java index e8ca9f0d4..17c00e989 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java +++ b/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java @@ -32,7 +32,8 @@ public class SideBlockSupportRequired implements BlockStructuralSupport { public boolean shouldBeRemovedDueToChange(Vector3i location, Side sideChanged) { final SideBlockSupportRequiredComponent component = getComponent(location, Collections.emptyMap()); if (component != null) { - final boolean sufficientlySupported = isSufficientlySupported(location, sideChanged, Collections.emptyMap(), component); + final boolean sufficientlySupported = isSufficientlySupported(location, sideChanged, + Collections.emptyMap(), component); if (!sufficientlySupported) { if (component.dropDelay <= 0) { return true; @@ -49,11 +50,13 @@ public class SideBlockSupportRequired implements BlockStructuralSupport { } @ReceiveEvent - public void checkForSupport(DelayedActionTriggeredEvent event, EntityRef entity, BlockComponent block, SideBlockSupportRequiredComponent supportRequired) { + public void checkForSupport(DelayedActionTriggeredEvent event, EntityRef entity, BlockComponent block, + SideBlockSupportRequiredComponent supportRequired) { if (event.getActionId().equals(SUPPORT_CHECK_ACTION_ID)) { if (!isSufficientlySupported(block.getPosition(), null, Collections.emptyMap(), supportRequired)) { PrefabManager prefabManager = CoreRegistry.get(PrefabManager.class); - entity.send(new DestroyEvent(entity, EntityRef.NULL, prefabManager.getPrefab("engine:supportRemovedDamage"))); + entity.send(new DestroyEvent(entity, EntityRef.NULL, prefabManager.getPrefab("engine" + + ":supportRemovedDamage"))); } } } @@ -80,11 +83,14 @@ public class SideBlockSupportRequired implements BlockStructuralSupport { } } - private SideBlockSupportRequiredComponent getComponent(Vector3ic location, Map blockOverrides) { + private SideBlockSupportRequiredComponent getComponent(Vector3ic location, + Map blockOverrides) { return getEntity(location, blockOverrides).getComponent(SideBlockSupportRequiredComponent.class); } - private boolean isSufficientlySupported(Vector3ic location, Side sideChanged, Map blockOverrides, SideBlockSupportRequiredComponent supportComponent) { + private boolean isSufficientlySupported(Vector3ic location, Side sideChanged, + Map blockOverrides, + SideBlockSupportRequiredComponent supportComponent) { if (supportComponent != null) { if ((sideChanged == null || sideChanged.isHorizontal()) && supportComponent.sideAllowed && !hasSupport(location, supportComponent, blockOverrides)) { @@ -97,7 +103,8 @@ public class SideBlockSupportRequired implements BlockStructuralSupport { return true; } - private boolean hasSupport(Vector3ic blockPosition, SideBlockSupportRequiredComponent supportComponent, Map blockOverrides) { + private boolean hasSupport(Vector3ic blockPosition, SideBlockSupportRequiredComponent supportComponent, Map blockOverrides) { if (supportComponent.bottomAllowed && hasSupportFromBlockOnSide(blockPosition, Side.BOTTOM, blockOverrides)) { return true; } @@ -113,7 +120,8 @@ public class SideBlockSupportRequired implements BlockStructuralSupport { return false; } - private boolean hasSupportFromBlockOnSide(Vector3ic blockPosition, Side side, Map blockOverrides) { + private boolean hasSupportFromBlockOnSide(Vector3ic blockPosition, Side side, + Map blockOverrides) { final Vector3i sideBlockPosition = side.getAdjacentPos(blockPosition, new Vector3i()); if (!getWorldProvider().isBlockRelevant(sideBlockPosition)) { return true; diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java index 39f3f61f2..63c3c4f84 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java @@ -13,8 +13,6 @@ import java.util.Collections; import java.util.List; import java.util.function.Consumer; -/** - */ @API public class BlockTile extends Asset { private BufferedImage[] images; diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java index 847cce885..f87886a47 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java @@ -6,8 +6,6 @@ import org.terasology.gestalt.assets.AssetData; import java.awt.image.BufferedImage; -/** - */ public class TileData implements AssetData { private BufferedImage[] images; private boolean autoBlock; diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java index ed70bc924..75867b978 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java @@ -34,13 +34,12 @@ public class TileFormat extends AbstractAssetFileFormat { if (!IntMath.isPowerOfTwo(image.getHeight()) || image.getWidth() % image.getHeight() != 0 || image.getWidth() == 0) { throw new IOException("Invalid tile - must be horizontal row of power-of-two sized squares"); } - BufferedImage[] frames = new BufferedImage[image.getWidth()/image.getHeight()]; - for (int i=0; i requiredChunks; // The sizes of all of the LOD chunks that are meant to exist. All the chunks at the same positions with larger sizes also may exist, but don't always. + // The sizes of all of the LOD chunks that are meant to exist. All the chunks at the same positions with larger + // sizes also may exist, but don't always. + private Map requiredChunks; private ArrayList> chunks = new ArrayList<>(); private ClosenessComparator nearby; @@ -58,7 +62,8 @@ public class LodChunkProvider { private BlockingQueue readyChunks = Queues.newLinkedBlockingQueue(); private List generationThreads = new ArrayList<>(); - public LodChunkProvider(Context context, ScalableWorldGenerator generator, ChunkTessellator tessellator, ViewDistance viewDistance, int chunkLods, Vector3i center) { + public LodChunkProvider(Context context, ScalableWorldGenerator generator, ChunkTessellator tessellator, + ViewDistance viewDistance, int chunkLods, Vector3i center) { chunkProvider = context.get(ChunkProvider.class); blockManager = context.get(BlockManager.class); extraDataManager = context.get(ExtraBlockDataManager.class); @@ -91,11 +96,13 @@ public class LodChunkProvider { generator.createChunk(chunk, (1 << scale) * (2f / (Chunks.SIZE_X - 2) + 1)); InternalLightProcessor.generateInternalLighting(chunk, 1 << scale); //tintChunk(chunk); - ChunkView view = new ChunkViewCoreImpl(new Chunk[]{chunk}, new BlockRegion(chunk.getPosition(new Vector3i())), new Vector3i(), unloaded); + ChunkView view = new ChunkViewCoreImpl(new Chunk[]{chunk}, + new BlockRegion(chunk.getPosition(new Vector3i())), new Vector3i(), unloaded); ChunkMesh mesh = tessellator.generateMesh(view, 1 << scale, 1); readyChunks.add(new LodChunk(pos, mesh, scale)); } - } catch (InterruptedException ignored) { } + } catch (InterruptedException ignored) { + } } private void processReadyChunks() { @@ -104,7 +111,8 @@ public class LodChunkProvider { Vector3i pos = chunk.getPosition(new Vector3i()); Integer requiredScale = requiredChunks.get(pos); int scale = chunk.scale; - if (requiredScale != null && requiredScale <= scale) { // The relevant region may have been updated since this chunk was requested. + if (requiredScale != null && requiredScale <= scale) { // The relevant region may have been updated since + // this chunk was requested. chunk.getMesh().generateVBOs(); chunk.getMesh().discardData(); Vector3i subPos = new Vector3i(); @@ -126,7 +134,8 @@ public class LodChunkProvider { chunks.get(scale).put(new Vector3i(pos), chunk); if (scale < chunkLods) { int mask = ~(1 << scale); - LodChunk largerChunk = chunks.get(scale + 1).get(new Vector3i(pos.x & mask, pos.y & mask, pos.z & mask)); + LodChunk largerChunk = chunks.get(scale + 1).get(new Vector3i(pos.x & mask, pos.y & mask, + pos.z & mask)); if (largerChunk != null) { largerChunk.hiddenness++; } @@ -146,9 +155,10 @@ public class LodChunkProvider { chunkLods = newChunkLods; nearby.pos = center; Vector3i viewDistance = new Vector3i(newViewDistance.getChunkDistance()).div(2); - Vector3i altViewDistance = viewDistance.add(1 - Math.abs(viewDistance.x % 2), 1 - Math.abs(viewDistance.y % 2), 1 - Math.abs(viewDistance.z % 2), new Vector3i()); + Vector3i altViewDistance = viewDistance.add(1 - Math.abs(viewDistance.x % 2), + 1 - Math.abs(viewDistance.y % 2), 1 - Math.abs(viewDistance.z % 2), new Vector3i()); BlockRegion newPossiblyLoadedRegion = new BlockRegion(newCenter).expand(viewDistance); - BlockRegion newProbablyLoadedRegion = new BlockRegion(newPossiblyLoadedRegion).expand(-1, -1, -1); + BlockRegion newProbablyLoadedRegion = new BlockRegion(newPossiblyLoadedRegion).expand(-1, -1, -1); BlockRegion[] newLodRegions = new BlockRegion[newChunkLods == 0 ? 0 : 1 + newChunkLods]; while (chunks.size() < newLodRegions.length) { chunks.add(new ConcurrentHashMap<>()); @@ -163,7 +173,9 @@ public class LodChunkProvider { if (i == 0) { newLodRegions[i] = new BlockRegion(newPossiblyLoadedRegion); } else { - // By making viewDistance odd, we ensure that every time a chunk boundary is crossed, at most a single lodRegion changes (except possibly for lodRegions[0], which is more closely tied to the renderable region). + // By making viewDistance odd, we ensure that every time a chunk boundary is crossed, at most a single + // lodRegion changes (except possibly for lodRegions[0], which is more closely tied to the renderable + // region). newLodRegions[i] = new BlockRegion(scaleDown(center, i)).expand(altViewDistance); } Vector3i min = newLodRegions[i].getMin(new Vector3i()); @@ -179,7 +191,9 @@ public class LodChunkProvider { Set previouslyRequiredChunks = new HashSet<>(requiredChunks.keySet()); for (Vector3ic pos : previouslyRequiredChunks) { int scale = requiredChunks.get(pos); - boolean gone = false; // Whether this entry in requiredChunks should be removed entirely (i.e. the chunk at the actually required scale is not at this position). + // Whether this entry in requiredChunks should be removed entirely (i.e. the chunk at the actually + // required scale is not at this position). + boolean gone = false; boolean increased = false; while (scale < newLodRegions.length && !gone && !newLodRegions[scale].contains(scaleDown(pos, scale))) { LodChunk chunk = chunks.get(scale).get(new Vector3i(pos)); @@ -209,9 +223,9 @@ public class LodChunkProvider { for (int scale = 0; scale < newLodRegions.length; scale++) { for (Vector3ic pos : newLodRegions[scale]) { if ( - scale == 0 && newProbablyLoadedRegion.contains(pos) - || scale == 0 && newPossiblyLoadedRegion.contains(pos) && chunkProvider.isChunkReady(pos) - || scale > 0 && newLodRegions[scale - 1].contains(pos.mul(2, new Vector3i())) + scale == 0 && newProbablyLoadedRegion.contains(pos) + || scale == 0 && newPossiblyLoadedRegion.contains(pos) && chunkProvider.isChunkReady(pos) + || scale > 0 && newLodRegions[scale - 1].contains(pos.mul(2, new Vector3i())) ) { continue; } diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java index 52dede49c..4dad0f219 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java @@ -7,8 +7,6 @@ import org.joml.Vector3i; import org.joml.Vector3ic; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class BeforeChunkUnload implements Event { private Vector3i chunkPos = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java index df124907a..8bce8e100 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java @@ -6,8 +6,6 @@ import org.joml.Vector3i; import org.joml.Vector3ic; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class OnChunkGenerated implements Event { private Vector3i chunkPos = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java index 8b9eebf38..a3fdfa40d 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java @@ -7,8 +7,6 @@ import org.joml.Vector3i; import org.joml.Vector3ic; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class OnChunkLoaded implements Event { private Vector3i chunkPos = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java index bef90c15d..fa02d4bd5 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java @@ -9,8 +9,6 @@ import org.terasology.engine.world.block.Block; import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.chunks.ChunkBlockIterator; -/** - */ public class ChunkBlockIteratorImpl implements ChunkBlockIterator { private final Vector3i worldOffset = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java index 523db0f29..ffda387cb 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java @@ -18,8 +18,6 @@ import org.terasology.engine.world.chunks.Chunks; import java.util.Iterator; import java.util.Set; -/** - */ public class ChunkRelevanceRegion { private EntityRef entity; private Vector3i relevanceDistance = new Vector3i(); @@ -37,7 +35,7 @@ public class ChunkRelevanceRegion { LocationComponent loc = entity.getComponent(LocationComponent.class); - if (loc == null||Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { + if (loc == null || Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { dirty = false; } else { center.set(Chunks.toChunkPos(loc.getWorldPosition(new Vector3f()), new Vector3i())); @@ -109,7 +107,7 @@ public class ChunkRelevanceRegion { private BlockRegion calculateRegion() { LocationComponent loc = entity.getComponent(LocationComponent.class); - if (loc != null&& !Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { + if (loc != null && !Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { Vector3i extents = new Vector3i(relevanceDistance.x / 2, relevanceDistance.y / 2, relevanceDistance.z / 2); return new BlockRegion(Chunks.toChunkPos(loc.getWorldPosition(new Vector3f()), new Vector3i())).expand(extents); } diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java index b17d05922..ff70a97e9 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java @@ -17,8 +17,6 @@ import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunks; -/** - */ public final class ChunkSerializer { private ChunkSerializer() { diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java b/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java index e02263c8f..57ccc732b 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.chunks.localChunkProvider; import org.terasology.engine.utilities.concurrency.Task; import org.terasology.engine.world.chunks.Chunk; -/** - */ public class ChunkUnloadRequest implements Task { private Chunk chunk; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java b/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java index ff8144782..c1bd50f5a 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.generation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - */ @Retention(RetentionPolicy.RUNTIME) public @interface FacetBorder { int top() default 0; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java b/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java index 742826609..a27be0992 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generation; -/** - */ public interface FacetProvider { /** diff --git a/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java b/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java index e80b2dfae..edeeccb2b 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.generation; import org.terasology.engine.world.block.BlockRegion; -/** - */ public interface GeneratingRegion { BlockRegion getRegion(); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Produces.java b/engine/src/main/java/org/terasology/engine/world/generation/Produces.java index 3b214f463..43d494204 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Produces.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Produces.java @@ -7,8 +7,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface Produces { diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Region.java b/engine/src/main/java/org/terasology/engine/world/generation/Region.java index 988520271..73e5a554a 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Region.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Region.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.generation; import org.terasology.engine.world.block.BlockRegion; -/** - */ public interface Region { T getFacet(Class dataType); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java b/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java index 95b295427..8684ccb66 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java @@ -11,8 +11,6 @@ import org.terasology.engine.world.block.BlockRegion; import java.util.Map; import java.util.Set; -/** - */ public class RegionImpl implements Region, GeneratingRegion { private final BlockRegion region; @@ -24,7 +22,9 @@ public class RegionImpl implements Region, GeneratingRegion { private final Set processedProviders = Sets.newHashSet(); private final ClassToInstanceMap generatedFacets = MutableClassToInstanceMap.create(); - public RegionImpl(BlockRegion region, ListMultimap, FacetProvider> facetProviderChains, Map, Border3D> borders, float scale) { + public RegionImpl(BlockRegion region, + ListMultimap, FacetProvider> facetProviderChains, Map, Border3D> borders, float scale) { this.region = region; this.facetProviderChains = facetProviderChains; this.borders = borders; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Updates.java b/engine/src/main/java/org/terasology/engine/world/generation/Updates.java index e15265601..c97fa7bd2 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Updates.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Updates.java @@ -7,8 +7,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface Updates { diff --git a/engine/src/main/java/org/terasology/engine/world/generation/World.java b/engine/src/main/java/org/terasology/engine/world/generation/World.java index 5af41a707..ae24ebd43 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/World.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/World.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.chunks.Chunk; import java.util.Set; -/** - */ public interface World { Region getWorldData(BlockRegion region, float scale); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java index 8fcb39bb9..7a9f6a394 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java @@ -24,8 +24,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -/** - */ public class WorldBuilder extends ProviderStore { private static final Logger logger = LoggerFactory.getLogger(WorldBuilder.class); @@ -94,17 +92,18 @@ public class WorldBuilder extends ProviderStore { List orderedRasterizers = ensureRasterizerOrdering(providerChains, false); List scalableRasterizers = ensureRasterizerOrdering(scalableProviderChains, true); return new WorldImpl( - providerChains, - scalableProviderChains, - orderedRasterizers, - scalableRasterizers, - entityProviders, - determineBorders(providerChains, orderedRasterizers), - seaLevel + providerChains, + scalableProviderChains, + orderedRasterizers, + scalableRasterizers, + entityProviders, + determineBorders(providerChains, orderedRasterizers), + seaLevel ); } - private Map, Border3D> determineBorders(ListMultimap, FacetProvider> providerChains, List worldRasterizers) { + private Map, Border3D> determineBorders(ListMultimap, + FacetProvider> providerChains, List worldRasterizers) { List orderedProviders = new ArrayList<>(); for (Class facet : providerChains.keySet()) { for (FacetProvider provider : providerChains.get(facet)) { @@ -201,7 +200,9 @@ public class WorldBuilder extends ProviderStore { return result; } - private void determineProviderChainFor(Class facet, ListMultimap, FacetProvider> result, boolean scalable) { + private void determineProviderChainFor(Class facet, + ListMultimap, FacetProvider> result, + boolean scalable) { if (result.containsKey(facet)) { return; } @@ -357,7 +358,9 @@ public class WorldBuilder extends ProviderStore { return orderedRasterizers; } - private void tryAddRasterizer(List orderedRasterizers, WorldRasterizer rasterizer, ListMultimap, FacetProvider> providerChains, boolean scalable) { + private void tryAddRasterizer(List orderedRasterizers, WorldRasterizer rasterizer, + ListMultimap, FacetProvider> providerChains, + boolean scalable) { if (scalable && !(rasterizer instanceof ScalableWorldRasterizer)) { return; } diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java index 4eeee7149..4da1dbd7d 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generation; -/** - */ public interface WorldFacet { } diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java index 5fbdaa1bf..e532bdedc 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.generation; import org.terasology.engine.world.block.BlockAreac; -/** - */ public interface WorldFacet2D extends WorldFacet { /** diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java index b8bf39e68..bad0960c5 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.generation; import org.terasology.engine.world.block.BlockRegionc; -/** - */ public interface WorldFacet3D extends WorldFacet { /** diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java index 2f3badf6d..4cc9eb2c8 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java @@ -13,8 +13,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -/** - */ public class WorldImpl implements World { private final ListMultimap, FacetProvider> facetProviderChains; private final ListMultimap, FacetProvider> scalableFacetProviderChains; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java index d2edb7d33..8e93d2f1f 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.generation; import org.terasology.engine.world.chunks.Chunk; -/** - */ public interface WorldRasterizer { void initialize(); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java index de7f76670..340cc80c9 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java @@ -6,8 +6,6 @@ import org.terasology.engine.world.generation.facets.base.BaseFieldFacet3D; import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; -/** - */ public class DensityFacet extends BaseFieldFacet3D { public DensityFacet(BlockRegionc targetRegion, Border3D border) { diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java index 9244f7aa1..482a9abda 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.block.BlockRegion; import org.terasology.engine.world.generation.Border3D; import org.terasology.engine.world.generation.FacetName; -/** - */ @FacetName("Temperature") public class SurfaceTemperatureFacet extends BaseFieldFacet2D { static int maxSamplesPerRegion = 5; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java index ddbc7c128..113c6f1c8 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java @@ -7,8 +7,6 @@ import org.joml.Vector3ic; import org.terasology.engine.world.block.BlockRegion; import org.terasology.engine.world.generation.Border3D; -/** - */ public abstract class BaseBooleanFieldFacet3D extends BaseFacet3D implements BooleanFieldFacet3D { private boolean[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java index 0089b53b6..8bab9f493 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java @@ -9,8 +9,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; import org.terasology.engine.world.generation.WorldFacet2D; -/** - */ public class BaseFacet2D implements WorldFacet2D { private BlockArea worldRegion; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java index cb52360c7..3b0ba0cea 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java @@ -8,8 +8,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public class BaseFacet3D implements WorldFacet3D { private BlockRegion worldRegion; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java index 9468f5e03..c960c5206 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java @@ -7,8 +7,6 @@ import org.joml.Vector2ic; import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; -/** - */ public abstract class BaseFieldFacet2D extends BaseFacet2D implements FieldFacet2D { private float[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java index fb3f1ea59..99ac07070 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java @@ -7,8 +7,6 @@ import org.joml.Vector3ic; import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; -/** - */ public abstract class BaseFieldFacet3D extends BaseFacet3D implements FieldFacet3D { private float[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java index 9ff89b00a..657e60d95 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java @@ -9,8 +9,6 @@ import org.terasology.engine.world.generation.Border3D; import java.lang.reflect.Array; -/** - */ public abstract class BaseObjectFacet2D extends BaseFacet2D implements ObjectFacet2D { private T[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java index 5899e179b..dbe95ee57 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.generation.facets.base; import org.joml.Vector3ic; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public interface BooleanFieldFacet3D extends WorldFacet3D { boolean get(int x, int y, int z); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java index c12aa6d7a..25c58668d 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.generation.facets.base; import org.joml.Vector2ic; import org.terasology.engine.world.generation.WorldFacet2D; -/** - */ public interface FieldFacet2D extends WorldFacet2D { float get(int x, int y); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java index d683a73b7..8d6187848 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.generation.facets.base; import org.joml.Vector3ic; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public interface FieldFacet3D extends WorldFacet3D { float get(int x, int y, int z); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java index 09132038e..ccbd94ecb 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.generation.facets.base; import org.joml.Vector2ic; import org.terasology.engine.world.generation.WorldFacet2D; -/** - */ public interface ObjectFacet2D extends WorldFacet2D { T get(int x, int y); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java index 54b3a3101..02e2cac16 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java @@ -5,8 +5,6 @@ package org.terasology.engine.world.generation.facets.base; import org.joml.Vector3ic; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public interface ObjectFacet3D extends WorldFacet3D { T get(int x, int y, int z); diff --git a/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java b/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java index 54945cd55..81d64ea76 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.chunks.Chunk; import java.util.Map; -/** - */ public interface ChunkGenerationPass { void setWorldSeed(String seed); diff --git a/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java b/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java index 7bb36730d..db33afd4d 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generator; -/** - */ public class UnresolvedWorldGeneratorException extends Exception { private static final long serialVersionUID = 2096504461776129337L; diff --git a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java index 9deea3517..ed98c8450 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java @@ -6,8 +6,6 @@ import org.terasology.engine.core.SimpleUri; import java.util.Objects; -/** - */ public class WorldGeneratorInfo implements Comparable { private SimpleUri uri; diff --git a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java index 619d32674..25c2c6452 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java @@ -25,8 +25,6 @@ import java.util.List; import static com.google.common.base.Verify.verifyNotNull; -/** - */ public class WorldGeneratorManager { private static final Logger logger = LoggerFactory.getLogger(WorldGeneratorManager.class); diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java index e4fefaece..10ef092fe 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java @@ -14,8 +14,6 @@ import org.terasology.reflection.reflect.ReflectFactory; import java.util.List; -/** - */ public class DefaultWorldGeneratorPluginLibrary implements WorldGeneratorPluginLibrary { private final ClassLibrary library; @@ -24,7 +22,8 @@ public class DefaultWorldGeneratorPluginLibrary implements WorldGeneratorPluginL library = new DefaultModuleClassLibrary<>(moduleEnvironment, context.get(ReflectFactory.class), context.get(CopyStrategyLibrary.class)); for (Class entry : moduleEnvironment.getTypesAnnotatedWith(RegisterPlugin.class)) { if (WorldGeneratorPlugin.class.isAssignableFrom(entry)) { - library.register(new ResourceUrn(moduleEnvironment.getModuleProviding(entry).toString(), entry.getSimpleName()).toString(), entry.asSubclass(WorldGeneratorPlugin.class)); + ResourceUrn resourceUrn = new ResourceUrn(moduleEnvironment.getModuleProviding(entry).toString(), entry.getSimpleName()); + library.register(resourceUrn.toString(), entry.asSubclass(WorldGeneratorPlugin.class)); } } } diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java index f6af70b2e..6b31dad89 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java @@ -7,8 +7,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterPlugin { diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java index cc4e260a3..992ac9b5b 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java @@ -2,7 +2,5 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generator.plugin; -/** - */ public interface WorldGeneratorPlugin { } diff --git a/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java b/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java index 9a114b451..7467c9094 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java @@ -13,8 +13,6 @@ import org.terasology.engine.world.time.WorldTime; import java.util.Collection; import java.util.Map; -/** - */ public class AbstractWorldProviderDecorator implements WorldProviderCore { private WorldProviderCore base; diff --git a/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java b/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java index 9a0aa941f..38058b3b0 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java @@ -14,8 +14,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunks; -/** - */ public class ChunkViewCoreImpl implements ChunkViewCore { private static final Logger logger = LoggerFactory.getLogger(ChunkViewCoreImpl.class); diff --git a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java index 4df0d31af..0db211158 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java @@ -44,9 +44,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -/** - * - */ + public class WorldProviderCoreImpl implements WorldProviderCore { private String title; diff --git a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java index a2180aa33..205f7193b 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java @@ -15,8 +15,6 @@ import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager; import java.util.Collection; -/** - */ public class WorldProviderWrapper extends AbstractWorldProviderDecorator implements WorldProvider { private WorldProviderCore core; private ExtraBlockDataManager extraDataManager; diff --git a/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java b/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java index ec4e92a44..6e392b7eb 100644 --- a/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java +++ b/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java @@ -4,8 +4,6 @@ package org.terasology.engine.world.time; import org.terasology.engine.entitySystem.systems.ComponentSystem; -/** - */ public interface WorldTime extends ComponentSystem { /** diff --git a/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java b/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java index d2165a822..8f87777bd 100644 --- a/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java @@ -12,8 +12,6 @@ import org.terasology.engine.world.WorldComponent; import java.util.concurrent.atomic.AtomicLong; -/** - */ public class WorldTimeImpl extends BaseComponentSystem implements WorldTime, UpdateSubscriberSystem { private static final float WORLD_TIME_MULTIPLIER = 48f; diff --git a/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java b/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java index e6a0b4333..664b9dc50 100644 --- a/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java +++ b/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java @@ -23,5 +23,5 @@ public interface LayerThickness { * * @param parent the layer this is attached to */ - default void initialize(LayeredZoneRegionFunction parent) {} + default void initialize(LayeredZoneRegionFunction parent) { } } diff --git a/engine/src/main/java/org/terasology/engine/world/zones/Zone.java b/engine/src/main/java/org/terasology/engine/world/zones/Zone.java index 1f6577ad3..4c75742c4 100644 --- a/engine/src/main/java/org/terasology/engine/world/zones/Zone.java +++ b/engine/src/main/java/org/terasology/engine/world/zones/Zone.java @@ -118,7 +118,7 @@ public class Zone extends ProviderStore implements WorldRasterizer, EntityProvid //Save the blocks that aren't in the zone for (int x = 0; x < Chunks.SIZE_X; x++) { - for (int y = 0; y { diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java index 7ccda116a..82e4f1b07 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.properties; import java.util.List; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java index 36d90209b..9165b0853 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java @@ -1,24 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.properties; import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.context.Context; import org.terasology.nui.properties.Range; import org.terasology.reflection.copy.CopyStrategyLibrary; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java index e770537af..515e43369 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.properties; import com.google.common.collect.Lists; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java index c1e125660..c2c6d5f4d 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.subsystem; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java index ebae5893f..e386179c5 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.subsystem; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java index cd78fcc9d..a0fe9ec2b 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.subsystem; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java index 958a2a180..0189c0714 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.slf4j.Logger; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java index 258e19040..1499b03ed 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.terasology.editor.properties.FloatProperty; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java index dbd7f6fa9..28eb12f29 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.terasology.editor.properties.FloatProperty; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java index 7eeafd5a2..0d51a349d 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.lwjgl.opengl.awt.AWTGLCanvas; diff --git a/subsystems/DiscordRPC/build.gradle.kts b/subsystems/DiscordRPC/build.gradle.kts index e0d2b6861..df6cd5c98 100644 --- a/subsystems/DiscordRPC/build.gradle.kts +++ b/subsystems/DiscordRPC/build.gradle.kts @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 plugins { diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java index 3ed3c9654..45b677a15 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.subsystem.discordrpc; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java index 85d5644fa..72155a4dd 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.subsystem.discordrpc; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java index 89b67ddb9..663c1499a 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.subsystem.discordrpc; @@ -254,14 +254,17 @@ public final class DiscordRPCThread implements IPCListener, Runnable { RichPresence.Builder builder = new RichPresence.Builder() .setLargeImage(DISCORD_APP_DEFAULT_IMAGE); - if (buffer.getDetails() != null) + if (buffer.getDetails() != null) { builder.setDetails(buffer.getDetails()); + } - if (buffer.getState() != null) + if (buffer.getState() != null) { builder.setState(buffer.getState()); + } - if (buffer.getStartTimestamp() != null) + if (buffer.getStartTimestamp() != null) { builder.setStartTimestamp(buffer.getStartTimestamp()); + } int partySize = buffer.getPartySize(); int partyMax = buffer.getPartyMax(); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java index 6692ea01b..ac1dccf8e 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java index 9f9139cd2..13374d77c 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java index 82a072072..000b07caf 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java index 9294c5f4a..e4a0586cc 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java index a750525b3..453f5182f 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java index aad114b71..066bbdf48 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java index 0c4bb3299..6bedaa118 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java index 9646e4571..969e46fc3 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java @@ -1,12 +1,10 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; import java.nio.ByteBuffer; -/** - */ public interface PersistedData { /** diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java index 587b6ae10..e8dbcac24 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; @@ -9,8 +9,6 @@ import gnu.trove.list.TLongList; import java.util.List; -/** - */ public interface PersistedDataArray extends PersistedData, Iterable { int size(); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java index f467939ec..ad7f68aa6 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java @@ -7,8 +7,6 @@ import org.terasology.persistence.typeHandling.inMemory.PersistedMap; import java.util.Map; import java.util.Set; -/** - */ public interface PersistedDataMap extends PersistedData { boolean has(String name); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java index 81b966567..2b35ef3fa 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; @@ -10,9 +10,7 @@ import gnu.trove.iterator.TLongIterator; import java.nio.ByteBuffer; import java.util.Map; -/** - * - */ + public interface PersistedDataSerializer { /** diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java index c35117489..217941e95 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java index 8ed561245..1abf8c993 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java index 57dd39772..5d4ea3f05 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java @@ -1,11 +1,9 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; import java.util.Optional; -/** - */ public abstract class StringRepresentationTypeHandler extends TypeHandler { public abstract String getAsString(T item); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java index 3302bed81..ac165f48e 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java index 322442578..e339b4edc 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java index 1c320f87d..da70bc2d0 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.annotations; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java index 863250db6..72aa0ae95 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class BooleanTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java index 0bd9c3f81..73dce252c 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class ByteTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java index 2e38349dc..dcaf93d77 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class DoubleTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java index 1ba03c336..cd0bc4ba3 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java @@ -13,8 +13,6 @@ import java.util.Locale; import java.util.Map; import java.util.Optional; -/** - */ public class EnumTypeHandler extends TypeHandler { private static final Logger logger = LoggerFactory.getLogger(EnumTypeHandler.class); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java index e5787c873..e0e8ead82 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class FloatTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java index 8b25701e7..d26800dfa 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class IntTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java index 9dac8fd99..fcc4677f5 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class LongTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java index 24950c1e5..12fe8a47b 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java @@ -9,8 +9,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class NumberTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java index cc7436566..fadf27e74 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java @@ -10,8 +10,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Map; import java.util.Optional; -/** - */ public class StringMapTypeHandler extends TypeHandler> { private TypeHandler contentsHandler; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java index 6b6e81728..6e1f6ea58 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java @@ -8,8 +8,6 @@ import org.terasology.persistence.typeHandling.TypeHandler; import java.util.Optional; -/** - */ public class StringTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java index f30762962..e40a230b2 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java @@ -9,8 +9,6 @@ import org.terasology.persistence.typeHandling.PersistedDataMap; import java.nio.ByteBuffer; -/** - */ public abstract class AbstractPersistedData implements PersistedData { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java index 38f2159d9..d5942e444 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedBoolean extends AbstractPersistedData { private boolean data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java index 06aaeeefd..3585432ed 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java index f4f1e8d3a..cfc3ac5ab 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedDouble extends PersistedNumber { private double data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java index fb3dee2bd..9c6253e00 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedFloat extends PersistedNumber { private float data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java index 323a4b9af..b3578f79e 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedInteger extends PersistedNumber { private int data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java index 5a5954ae9..09cda7839 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedLong extends PersistedNumber { private long data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java index 821e173f1..f114b3320 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java @@ -9,8 +9,6 @@ import org.terasology.persistence.typeHandling.PersistedDataMap; import java.util.Map; import java.util.Set; -/** - */ public class PersistedMap extends AbstractPersistedData implements PersistedDataMap { private Map map; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java index 02ea3f051..b1fae536f 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public abstract class PersistedNumber extends AbstractPersistedData { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java index 2518f4712..8a33b8cc7 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedString extends AbstractPersistedData { private String data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java index 757870988..4cb2358a9 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory.arrays; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java index 32a41d107..dec69e8d5 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java @@ -68,7 +68,7 @@ public class PersistedValueArray extends AbstractPersistedArray { if (persistedData.isNumber()) { return persistedData.getAsInteger(); } else { - throw new ClassCastException("Data is not a Integer" ); + throw new ClassCastException("Data is not a Integer"); } } else { throw new IllegalStateException("Data is an array of size != 1"); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java index 405e40af1..871213330 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 /** diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java index 8649ece67..229bc7922 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on 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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection.reflect; import java.util.Collection; diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java index 238e772c2..39f970269 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java @@ -56,16 +56,16 @@ public class FutureTypeHandlerTest { ResultCaptor>>> resultCaptor = new ResultCaptor<>(); doAnswer(resultCaptor).when(typeHandlerLibrary).getTypeHandler( - eq(new TypeInfo>() {}.getType()) + eq(new TypeInfo>() { }.getType()) ); TypeHandler> typeHandler = typeHandlerLibrary.getTypeHandler( - new TypeInfo>() {} + new TypeInfo>() { } ).get(); verify(typeHandlerLibrary, times(1)).getTypeHandler( - eq(new TypeInfo>() {}.getType()) + eq(new TypeInfo>() { }.getType()) ); // Optional#get() can throw NoSuchElementException diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java index 5e8eb3deb..6d027341d 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java @@ -33,7 +33,7 @@ class TypeHandlerLibraryTest { } @MappedContainer - private static class AMappedContainer {} + private static class AMappedContainer { } @Test public void testMappedContainerHandler() { @@ -45,17 +45,17 @@ class TypeHandlerLibraryTest { @Test public void testCollectionHandler() { TypeHandler> setHandler = - typeHandlerLibrary.getTypeHandler(new TypeInfo>() {}).get(); + typeHandlerLibrary.getTypeHandler(new TypeInfo>() { }).get(); assertTrue(setHandler instanceof CollectionTypeHandler); TypeHandler> listHandler = - typeHandlerLibrary.getTypeHandler(new TypeInfo>() {}).get(); + typeHandlerLibrary.getTypeHandler(new TypeInfo>() { }).get(); assertTrue(listHandler instanceof CollectionTypeHandler); TypeHandler> queueHandler = - typeHandlerLibrary.getTypeHandler(new TypeInfo>() {}).get(); + typeHandlerLibrary.getTypeHandler(new TypeInfo>() { }).get(); assertTrue(queueHandler instanceof CollectionTypeHandler); } @@ -92,5 +92,5 @@ class TypeHandlerLibraryTest { assertTrue(handler instanceof RuntimeDelegatingTypeHandler); } - private enum AnEnum {} + private enum AnEnum { } } diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java index 7640d1f58..457b6c170 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java @@ -54,7 +54,7 @@ class RuntimeDelegatingTypeHandlerTest { subType = Sub.class; baseType = TypeInfo.of(Base.class).getType(); - abstract class SubHandler extends TypeHandler {} + abstract class SubHandler extends TypeHandler { } baseTypeHandler = mockTypeHandler(); subTypeHandler = mockTypeHandler(SubHandler.class); @@ -129,8 +129,8 @@ class RuntimeDelegatingTypeHandlerTest { argThat((ArgumentMatcher>) argument -> { return argument.get(RuntimeDelegatingTypeHandler.TYPE_FIELD) .getAsString() - .equals(subType.getName()) && - argument.containsKey(RuntimeDelegatingTypeHandler.VALUE_FIELD); + .equals(subType.getName()) + && argument.containsKey(RuntimeDelegatingTypeHandler.VALUE_FIELD); }) ); } diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java index d7c3352c5..38144a567 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java @@ -41,7 +41,7 @@ class ArrayTypeHandlerFactoryTest { @Test void testGenericArray() { - TypeInfo[]> arrayTypeInfo = new TypeInfo[]>() {}; + TypeInfo[]> arrayTypeInfo = new TypeInfo[]>() { }; Optional[]>> typeHandler = typeHandlerFactory.create(arrayTypeInfo, context); @@ -50,12 +50,12 @@ class ArrayTypeHandlerFactoryTest { assertTrue(typeHandler.get() instanceof ArrayTypeHandler); // Verify that the List TypeHandler was loaded from the TypeHandlerLibrary - verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() {}.getType())); + verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() { }.getType())); } @Test void testNonArray() { - TypeInfo> arrayTypeInfo = new TypeInfo>() {}; + TypeInfo> arrayTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(arrayTypeInfo, context); diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java index 16fefdd04..1be029d43 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java @@ -32,7 +32,7 @@ public class CollectionTypeHandlerFactoryTest { @Test public void testList() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -46,7 +46,7 @@ public class CollectionTypeHandlerFactoryTest { @Test public void testSet() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -60,7 +60,7 @@ public class CollectionTypeHandlerFactoryTest { @Test public void testQueue() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -74,7 +74,7 @@ public class CollectionTypeHandlerFactoryTest { @Test public void testNonGenericCollection() { - class IntList extends ArrayList {} + class IntList extends ArrayList { } Optional> typeHandler = typeHandlerFactory.create(TypeInfo.of(IntList.class), context); diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java index f2b73d4a0..311e58739 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java @@ -31,7 +31,7 @@ class MapTypeHandlerFactoryTest { @Test void testStringMap() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -45,7 +45,7 @@ class MapTypeHandlerFactoryTest { @Test void testNonStringMap() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -55,7 +55,7 @@ class MapTypeHandlerFactoryTest { @Test void testNonGenericMap() { - class IntMap extends HashMap {} + class IntMap extends HashMap { } Optional> typeHandler = typeHandlerFactory.create(TypeInfo.of(IntMap.class), context); @@ -70,7 +70,7 @@ class MapTypeHandlerFactoryTest { @Test void testGenericMap() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java index 5c180ac50..3451b19d9 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java @@ -38,7 +38,7 @@ public class ObjectFieldMapTypeHandlerFactoryTest { @Test public void testObject() { Optional>> typeHandler = - typeHandlerFactory.create(new TypeInfo>() {}, context); + typeHandlerFactory.create(new TypeInfo>() { }, context); assertTrue(typeHandler.isPresent()); assertTrue(typeHandler.get() instanceof ObjectFieldMapTypeHandler); @@ -46,6 +46,6 @@ public class ObjectFieldMapTypeHandlerFactoryTest { // Verify that the Integer and List TypeHandlers were loaded from the TypeHandlerLibrary verify(typeHandlerLibrary).getTypeHandler(eq(TypeInfo.of(Integer.class).getType())); - verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() {}.getType())); + verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() { }.getType())); } } diff --git a/subsystems/subprojects.settings.gradle b/subsystems/subprojects.settings.gradle index 35f4dd3d4..a26fa8caf 100644 --- a/subsystems/subprojects.settings.gradle +++ b/subsystems/subprojects.settings.gradle @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 // This magically allows subdirs in this subproject to themselves become sub-subprojects in a proper tree structure