From e11c4f7cb53ebfda6e6b95050e3c2f772355aa44 Mon Sep 17 00:00:00 2001 From: jdrueckert Date: Sun, 20 Jun 2021 19:50:09 +0200 Subject: [PATCH] style: fix checkstyle findings (#4781) --- .../metadata/FieldMetadataTest.java | 3 +- .../internal/MetadataBuilderTest.java | 12 +- .../engine/logic/behavior/CounterTest.java | 24 ++- .../logic/behavior/DynamicSelectorTest.java | 21 +- .../engine/logic/behavior/Example.java | 6 +- .../engine/logic/behavior/ParallelTest.java | 21 +- .../characters/VisualCharacterSystemTest.java | 6 +- .../persistence/ComponentSerializerTest.java | 17 +- .../persistence/EntitySerializerTest.java | 5 +- .../nui/layouts/ColumnLayoutTest.java | 50 +++-- .../rendering/nui/layouts/RowLayoutTest.java | 27 ++- .../nui/widgets/treeView/GenericTreeTest.java | 3 +- .../terasology/engine/world/ChunkTest.java | 3 +- .../world/EntityAwareWorldProviderTest.java | 37 ++-- .../pipeline/ChunkProcessingPipelineTest.java | 3 +- .../reflect/ByteCodeReflectFactoryTest.java | 10 +- .../utilities/MersenneRandomTest.java | 186 ++++++++++-------- .../utilities/time/DateTimeHelperTest.java | 9 +- .../org/terasology/engine/audio/Sound.java | 6 +- .../terasology/engine/audio/StaticSound.java | 6 +- .../engine/audio/StreamingSound.java | 6 +- .../engine/audio/events/package-info.java | 3 +- .../engine/audio/openAL/OpenALManager.java | 6 +- .../audio/openAL/staticSound/OpenALSound.java | 6 +- .../engine/config/SecurityConfig.java | 15 +- .../engine/config/TelemetryConfig.java | 7 +- .../flexible/ui/ConstraintWidgetFactory.java | 3 +- .../terasology/engine/core/EngineStatus.java | 4 +- .../core/bootstrap/EntitySystemSetupUtil.java | 13 +- .../bootstrap/EnvironmentSwitchHandler.java | 1 - .../AwaitedLocalCharacterSpawnEvent.java | 5 +- .../core/subsystem/EngineSubsystem.java | 5 +- .../core/subsystem/config/BindsSubsystem.java | 7 +- .../renderer/HeadlessCanvasRenderer.java | 13 +- .../renderer/HeadlessWorldRenderer.java | 14 +- .../event/internal/EventSystem.java | 12 +- .../metadata/ComponentFieldMetadata.java | 11 +- .../metadata/ComponentLibrary.java | 3 +- .../metadata/ComponentMetadata.java | 6 +- .../entitySystem/metadata/EventLibrary.java | 3 +- .../entitySystem/metadata/EventMetadata.java | 6 +- .../metadata/ReplicatedFieldMetadata.java | 3 +- .../entitySystem/systems/ComponentSystem.java | 3 +- .../engine/identity/CertificateGenerator.java | 3 +- .../engine/identity/ClientIdentity.java | 3 +- .../identity/PrivateIdentityCertificate.java | 3 +- .../identity/PublicIdentityCertificate.java | 9 +- .../storageServiceClient/APISession.java | 6 +- .../ServiceApiRequest.java | 12 +- .../binds/movement/ForwardsMovementAxis.java | 3 +- .../cameraTarget/PlayerTargetSystem.java | 3 +- .../engine/logic/ai/SimpleAISystem.java | 9 +- .../engine/logic/behavior/BehaviorSystem.java | 3 +- .../behavior/CollectiveBehaviorSystem.java | 3 +- .../actions/conditions/ConditionAction.java | 9 +- .../logic/behavior/asset/BehaviorTree.java | 3 +- .../logic/behavior/nui/BehaviorEditor.java | 3 +- .../logic/behavior/nui/RenderableNode.java | 4 +- .../characters/CharacterMoveInputEvent.java | 6 +- .../logic/characters/CharacterSystem.java | 9 +- .../console/commands/ClientCommands.java | 9 +- .../logic/console/commands/CoreCommands.java | 16 +- .../logic/debug/MovementDebugCommands.java | 7 +- .../logic/players/CameraClientSystem.java | 6 +- .../players/DecreaseViewDistanceButton.java | 3 +- .../players/FirstPersonClientSystem.java | 25 ++- .../players/IncreaseViewDistanceButton.java | 3 +- .../engine/logic/players/LocalPlayer.java | 6 +- .../logic/time/TimeAuthoritySystem.java | 3 +- .../impl/PerformanceMonitorImpl.java | 16 +- .../internal/ClientConnectionHandler.java | 3 +- .../internal/ClientHandshakeHandler.java | 6 +- .../network/internal/HandshakeCommon.java | 6 +- .../engine/network/internal/NetClient.java | 9 +- .../network/internal/NetworkSystemImpl.java | 4 +- .../internal/ServerHandshakeHandler.java | 16 +- .../particles/ParticleSystemManager.java | 6 +- .../particles/ParticleSystemManagerImpl.java | 6 +- .../components/ParticleEmitterComponent.java | 6 +- .../RegisterParticleSystemFunction.java | 3 +- .../internal/ReadWriteStorageManager.java | 6 +- .../serializers/ComponentSerializer.java | 3 +- .../serializers/EntityDataJSONFormat.java | 15 +- .../serializers/EventSerializer.java | 7 +- .../serializers/NetworkEntitySerializer.java | 15 +- .../serializers/PrefabSerializer.java | 3 +- .../protobuf/ProtobufPersistedData.java | 3 +- .../engine/physics/bullet/BulletPhysics.java | 3 +- .../physics/bullet/BulletSweepCallback.java | 6 +- .../bullet/shapes/BulletCompoundShape.java | 15 +- .../bullet/world/VoxelBlockFluidWorld.java | 9 +- .../physics/bullet/world/VoxelBlockWorld.java | 9 +- .../engine/physics/engine/PhysicsSystem.java | 12 +- .../engine/physics/engine/RigidBody.java | 3 +- .../recording/EventSystemReplayImpl.java | 36 ++-- .../RecordAndReplayCurrentStatus.java | 14 +- .../engine/reflection/package-info.java | 3 +- .../reflect/ByteCodeReflectFactory.java | 6 +- .../engine/registry/InjectionHelper.java | 3 +- .../engine/rendering/RenderHelper.java | 5 +- .../engine/rendering/ShaderManagerLwjgl.java | 3 +- .../engine/rendering/assets/atlas/Atlas.java | 3 +- .../assets/font/FontMeshBuilder.java | 12 +- .../rendering/assets/mesh/MeshBuilder.java | 4 +- .../rendering/assets/mesh/ObjMeshFormat.java | 3 +- .../engine/rendering/dag/AbstractNode.java | 21 +- .../engine/rendering/dag/ModuleRendering.java | 6 +- .../engine/rendering/dag/RenderGraph.java | 42 ++-- .../DependencyConnection.java | 5 +- .../rendering/gltf/ByteBufferAsset.java | 3 +- .../rendering/gltf/GLTFAttributeMapping.java | 24 ++- .../rendering/gltf/GLTFCommonFormat.java | 30 ++- .../engine/rendering/gltf/GLTFMeshFormat.java | 15 +- .../rendering/gltf/MeshAttributeSemantic.java | 9 +- .../rendering/gltf/model/GLTFAccessor.java | 4 +- .../gltf/model/GLTFAnimationSampler.java | 4 +- .../rendering/gltf/model/GLTFBuffer.java | 3 +- .../rendering/gltf/model/GLTFChannel.java | 3 +- .../gltf/model/GLTFChannelTarget.java | 7 +- .../engine/rendering/gltf/model/GLTFMesh.java | 3 +- .../rendering/gltf/model/GLTFScene.java | 3 +- .../engine/rendering/gltf/model/GLTFSkin.java | 6 +- .../rendering/gltf/model/GLTFSparse.java | 4 +- .../iconmesh/IconMeshDataProducer.java | 4 +- .../rendering/iconmesh/IconMeshFactory.java | 13 +- .../rendering/logic/LightComponent.java | 10 +- .../engine/rendering/logic/MeshRenderer.java | 9 +- .../rendering/logic/SkeletonRenderer.java | 14 +- .../engine/rendering/nui/CanvasUtility.java | 6 +- .../internal/TerasologyCanvasRenderer.java | 3 +- .../nui/internal/WidgetMetadata.java | 6 +- .../layers/ingame/metrics/DebugOverlay.java | 3 +- .../nui/layers/mainMenu/FilePickerPopup.java | 8 +- .../nui/layers/mainMenu/LaunchPopup.java | 3 +- .../layers/mainMenu/NameRecordingScreen.java | 6 +- .../nui/layers/mainMenu/SelectionScreen.java | 15 +- .../layers/mainMenu/StartPlayingScreen.java | 21 +- .../layers/mainMenu/UniverseSetupScreen.java | 18 +- .../mainMenu/WorldPreGenerationScreen.java | 12 +- .../nui/layers/mainMenu/WorldSetupScreen.java | 15 +- .../AdvancedGameSetupScreen.java | 18 +- .../gameDetailsScreen/GameDetailsScreen.java | 16 +- .../ModuleDetailsScreen.java | 3 +- .../mainMenu/settings/IdentityIOHelper.java | 6 +- .../mainMenu/videoSettings/PresetBinding.java | 7 +- .../rendering/nui/skin/UISkinWithUrn.java | 3 +- .../rendering/nui/skin/package-info.java | 3 +- .../data/basic/FlowParagraphRenderable.java | 6 +- .../widgets/browser/data/html/HTMLUtils.java | 3 +- .../data/html/basic/ParagraphBuilder.java | 3 +- .../basic/list/ListParagraphRenderable.java | 3 +- .../html/basic/list/OrderedListDecorator.java | 6 +- .../basic/list/UnorderedListDecorator.java | 6 +- .../widgets/browser/ui/DocumentRenderer.java | 9 +- .../engine/rendering/opengl/FBO.java | 16 +- .../engine/rendering/opengl/GLSLMaterial.java | 3 +- .../engine/rendering/opengl/GLSLShader.java | 3 +- .../rendering/opengl/OpenGLSkeletalMesh.java | 9 +- .../primitives/TessellatorHelper.java | 3 +- .../rendering/world/RenderableWorldImpl.java | 5 +- .../terasology/engine/telemetry/Metrics.java | 3 +- .../engine/telemetry/TelemetryUtils.java | 9 +- .../logstash/UserIdJsonProvider.java | 6 +- .../engine/telemetry/metrics/Metric.java | 9 +- .../utilities/procedural/PerlinNoise.java | 6 +- .../utilities/procedural/SubSampledNoise.java | 22 ++- .../engine/utilities/procedural/Voronoi.java | 6 +- .../reflection/SpecificAccessibleObject.java | 6 +- .../world/block/BlockBuilderHelper.java | 24 ++- .../engine/world/block/BlockUri.java | 4 +- .../world/block/entity/BlockEntitySystem.java | 6 +- .../block/family/AttachedToSurfaceFamily.java | 6 +- .../block/family/BlockFamilyLibrary.java | 3 +- .../block/family/BlockPlacementData.java | 9 +- .../world/block/family/HorizontalFamily.java | 7 +- .../block/family/MultiConnectFamily.java | 9 +- .../world/block/internal/BlockBuilder.java | 54 +++-- .../loader/BlockFamilyDefinitionFormat.java | 6 +- .../world/block/shapes/BlockMeshPart.java | 6 +- .../world/block/shapes/BlockShapeImpl.java | 4 +- .../world/block/tiles/WorldAtlasImpl.java | 9 +- .../engine/world/chunks/Chunks.java | 7 +- .../world/chunks/blockdata/TeraArray.java | 6 +- .../chunks/blockdata/TeraDenseArray.java | 12 +- .../chunks/blockdata/TeraDenseArray16Bit.java | 3 +- .../chunks/blockdata/TeraDenseArrayByte.java | 3 +- .../blockdata/TeraSparseArray16Bit.java | 9 +- .../LocalChunkProvider.java | 4 +- .../RemoteChunkProvider.java | 4 +- .../engine/world/generation/Border3D.java | 8 +- .../engine/world/generation/WorldBuilder.java | 6 +- .../generation/facets/base/BaseFacet3D.java | 12 +- .../internal/WorldGeneratorManager.java | 16 +- .../DefaultWorldGeneratorPluginLibrary.java | 4 +- .../internal/EntityAwareWorldProvider.java | 11 +- .../world/propagation/BatchPropagator.java | 6 +- .../SunlightRegenBatchPropagator.java | 3 +- .../org/terasology/engine/Terasology.java | 6 +- .../editor/properties/ReflectionProvider.java | 6 +- .../discordrpc/DiscordRPCBuffer.java | 5 +- .../discordrpc/DiscordRPCSystem.java | 9 +- .../typeHandling/InstanceCreator.java | 4 +- 202 files changed, 1248 insertions(+), 660 deletions(-) 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 640abac3c..857a8c5b8 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 @@ -18,7 +18,8 @@ public class FieldMetadataTest { @Test public void testOwnsAnnotationProcessed() throws NoSuchMethodException { - ComponentMetadata classMetadata = new ComponentMetadata<>(new ResourceUrn("unittest:owner"), OwnerComponent.class, factory, copyStrategyLibrary); + ComponentMetadata classMetadata = new ComponentMetadata<>(new ResourceUrn("unittest:owner"), + OwnerComponent.class, factory, copyStrategyLibrary); ComponentFieldMetadata metadata = classMetadata.getField("child"); assertTrue(metadata.isOwnedReference()); } diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/internal/MetadataBuilderTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/internal/MetadataBuilderTest.java index 5982ad494..6c2943e03 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/internal/MetadataBuilderTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/internal/MetadataBuilderTest.java @@ -26,13 +26,15 @@ public class MetadataBuilderTest { @Test public void testDetectsLackOfDefaultConstructor() throws Exception { - DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", NoDefaultConstructor.class, factory, copyStrategyLibrary); + DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", + NoDefaultConstructor.class, factory, copyStrategyLibrary); assertFalse(metadata.isConstructable()); } @Test public void testTrivialMetadata() throws Exception { - DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", Trivial.class, factory, copyStrategyLibrary); + DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", + Trivial.class, factory, copyStrategyLibrary); assertNotNull(metadata); assertEquals(0, metadata.getFieldCount()); assertTrue(metadata.isConstructable()); @@ -40,7 +42,8 @@ public class MetadataBuilderTest { @Test public void testPrivateField() throws Exception { - DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", PrivateField.class, factory, copyStrategyLibrary); + DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", + PrivateField.class, factory, copyStrategyLibrary); assertNotNull(metadata); assertEquals(1, metadata.getFieldCount()); FieldMetadata fieldMetadata = metadata.getField("name"); @@ -52,7 +55,8 @@ public class MetadataBuilderTest { @Test public void testInheritsFields() throws Exception { - DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", Inheriting.class, factory, copyStrategyLibrary); + DefaultClassMetadata metadata = new DefaultClassMetadata<>("engine:empty", + Inheriting.class, factory, copyStrategyLibrary); assertNotNull(metadata); assertEquals(2, metadata.getFieldCount()); assertNotNull(metadata.getField("name")); diff --git a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/CounterTest.java b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/CounterTest.java index 39a2e0e42..bfd0c13dc 100644 --- a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/CounterTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/CounterTest.java @@ -23,15 +23,23 @@ public class CounterTest { assertRun("{ sequence:[ { print:{msg:A} }, { print:{msg:B} } ] }", 1, "[A][B]"); assertRun("{ sequence:[ { print:{msg:A} }, failure, { print:{msg:B} } ] }", 1, "[A]"); - assertRun("{ sequence:[ { counter:{ count=1, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", 1, "[A][B]"); - assertRun("{ sequence:[ { counter:{ count=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", 1, "[A]"); - assertRun("{ sequence:[ { counter:{ count=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", 2, "[A][A][B]"); - assertRun("{ sequence:[ { counter:{ count=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", 4, "[A][A][B][A][A][B]"); + assertRun("{ sequence:[ { counter:{ count=1, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", + 1, "[A][B]"); + assertRun("{ sequence:[ { counter:{ count=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", + 1, "[A]"); + assertRun("{ sequence:[ { counter:{ count=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", + 2, "[A][A][B]"); + assertRun("{ sequence:[ { counter:{ count=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", + 4, "[A][A][B][A][A][B]"); - assertRun("{ sequence:[ { counter:{ count=2, child:{ counter:{ count=2, child:{ print:{msg:A} } } } } },{ print:{msg:B} } ] }", 4, "[A][A][A][A][B]"); - assertRun("{ sequence:[ { timeout:{ time=1, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", 2, "[A][B][A][B]"); - assertRun("{ sequence:[ { timeout:{ time=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", 4, "[A][B][A][B][A][B][A][B]"); - assertRun("{ sequence:[ { timeout:{ time=1, child:{ timeout:{ time=2, child:{ print:{msg:A} } } } } },{ print:{msg:B} } ] }", 2, "[A][B][A][B]"); + assertRun("{ sequence:[ { counter:{ count=2, child:{ counter:{ count=2, child:{ print:{msg:A} } } } } },{ print:{msg:B} } ] }", + 4, "[A][A][A][A][B]"); + assertRun("{ sequence:[ { timeout:{ time=1, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", + 2, "[A][B][A][B]"); + assertRun("{ sequence:[ { timeout:{ time=2, child:{ print:{msg:A} } } },{ print:{msg:B} } ] }", + 4, "[A][B][A][B][A][B][A][B]"); + assertRun("{ sequence:[ { timeout:{ time=1, child:{ timeout:{ time=2, child:{ print:{msg:A} } } } } },{ print:{msg:B} } ] }", + 2, "[A][B][A][B]"); } @BeforeEach diff --git a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/DynamicSelectorTest.java b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/DynamicSelectorTest.java index 1f9b726e7..d45f0c7cd 100644 --- a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/DynamicSelectorTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/DynamicSelectorTest.java @@ -11,44 +11,51 @@ public class DynamicSelectorTest extends CountCallsTest { @Test public void testAllSuccess() { assertBT("{ dynamic:[success, success, success]}", - Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), + Arrays.asList(4, 1, 4, 1, 4, 1)); } @Test public void testAllFail() { assertBT("{ dynamic:[failure, failure, failure]}", - Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); + Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), + Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); } @Test public void testAllRunning() { assertBT("{ dynamic:[running, running, running]}", - Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), + Arrays.asList(4, 1, 4, 1, 4, 1)); } @Test public void testFailSuccess() { assertBT("{ dynamic:[failure, success, success]}", - Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), Arrays.asList(4, 1, 2, 4, 1, 2, 4, 1, 2)); + Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), + Arrays.asList(4, 1, 2, 4, 1, 2, 4, 1, 2)); } @Test public void testSuccessFail() { assertBT("{ dynamic:[success, failure, failure]}", - Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), + Arrays.asList(4, 1, 4, 1, 4, 1)); } @Test public void testRunningFail() { assertBT("{ dynamic:[running, failure, failure]}", - Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), + Arrays.asList(4, 1, 4, 1, 4, 1)); } @Test public void testRunningSuccess() { assertBT("{ dynamic:[running, success, success]}", - Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), + Arrays.asList(4, 1, 4, 1, 4, 1)); } } diff --git a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/Example.java b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/Example.java index 58ab37e38..16dd94b0d 100644 --- a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/Example.java +++ b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/Example.java @@ -31,7 +31,8 @@ public final class Example { treeBuilder.registerAction("delay", Delay.class); Actor actor = new Actor(null); actor.setDelta(0.1f); - node = treeBuilder.fromJson("{ sequence:[ success, { delay:{duration:1}}, { print:{msg:Hello} }, { delay:{duration:1}}, { print:{msg:World} } ] }"); + node = treeBuilder.fromJson("{ sequence:[ success, { delay:{duration:1}}, { print:{msg:Hello} }, " + + "{ delay:{duration:1}}, { print:{msg:World} } ] }"); DefaultBehaviorTreeRunner tree = new DefaultBehaviorTreeRunner(node, actor); for (int i = 0; i < 100; i++) { tree.step(); @@ -42,7 +43,8 @@ public final class Example { 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} } " + + "{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++) { diff --git a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/ParallelTest.java b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/ParallelTest.java index e58dfc9a9..957fa5d76 100644 --- a/engine-tests/src/test/java/org/terasology/engine/logic/behavior/ParallelTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/logic/behavior/ParallelTest.java @@ -14,49 +14,56 @@ public class ParallelTest extends CountCallsTest { @Test public void testAllSuccess() { assertBT("{ parallel:[success, success, success]}", - Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); + Arrays.asList(BehaviorState.SUCCESS, BehaviorState.SUCCESS, BehaviorState.SUCCESS), + Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); } @Disabled("Ignored for the moment") @Test public void testAllFail() { assertBT("{ parallel:[failure, failure, failure]}", - Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), + Arrays.asList(4, 1, 4, 1, 4, 1)); } @Disabled("Ignored for the moment") @Test public void testAllRunning() { assertBT("{ parallel:[running, running, running]}", - Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); + Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), + Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); } @Disabled("Ignored for the moment") @Test public void testFailSuccess() { assertBT("{ parallel:[failure, success, success]}", - Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), Arrays.asList(4, 1, 4, 1, 4, 1)); + Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), + Arrays.asList(4, 1, 4, 1, 4, 1)); } @Disabled("Ignored for the moment") @Test public void testSuccessFail() { assertBT("{ parallel:[success, failure, failure]}", - Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), Arrays.asList(4, 1, 2, 4, 1, 2, 4, 1, 2)); + Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), + Arrays.asList(4, 1, 2, 4, 1, 2, 4, 1, 2)); } @Disabled("Ignored for the moment") @Test public void testRunningFail() { assertBT("{ parallel:[running, failure, failure]}", - Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), Arrays.asList(4, 1, 2, 4, 1, 2, 4, 1, 2)); + Arrays.asList(BehaviorState.FAILURE, BehaviorState.FAILURE, BehaviorState.FAILURE), + Arrays.asList(4, 1, 2, 4, 1, 2, 4, 1, 2)); } @Disabled("Ignored for the moment") @Test public void testRunningSuccess() { assertBT("{ parallel:[running, success, success]}", - Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); + Arrays.asList(BehaviorState.RUNNING, BehaviorState.RUNNING, BehaviorState.RUNNING), + Arrays.asList(4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3)); } } diff --git a/engine-tests/src/test/java/org/terasology/engine/logic/characters/VisualCharacterSystemTest.java b/engine-tests/src/test/java/org/terasology/engine/logic/characters/VisualCharacterSystemTest.java index bc963a7d1..07b5d236f 100644 --- a/engine-tests/src/test/java/org/terasology/engine/logic/characters/VisualCharacterSystemTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/logic/characters/VisualCharacterSystemTest.java @@ -130,7 +130,8 @@ public class VisualCharacterSystemTest { List laterJoiningCharacterEntityEvents = new ArrayList<>(); recordEntityEventsToList(laterJoiningCharacterEntity, laterJoiningCharacterEntityEvents); VisualCharacterComponent visualComponentOfLaterJoiningCharacter = new VisualCharacterComponent(); - Mockito.when(laterJoiningCharacterEntity.getComponent(VisualCharacterComponent.class)).thenReturn(visualComponentOfLaterJoiningCharacter); + Mockito.when(laterJoiningCharacterEntity.getComponent(VisualCharacterComponent.class)) + .thenReturn(visualComponentOfLaterJoiningCharacter); // Joined player is not properly linked but it should not matter: Mockito.when(laterJoiningCharacterEntity.getOwner()).thenReturn(EntityRef.NULL); @@ -163,7 +164,8 @@ public class VisualCharacterSystemTest { clientEntityReturnedByLocalPlayer = clientEntity; Mockito.when(ownCharacterEntity.getOwner()).thenReturn(clientEntity); Mockito.when(otherCharacterEntity.getOwner()).thenReturn(otherClientEntity); - Mockito.when(entityManager.getEntitiesWith(VisualCharacterComponent.class)).thenReturn(Arrays.asList(otherCharacterEntity, ownCharacterEntity)); + Mockito.when(entityManager.getEntitiesWith(VisualCharacterComponent.class)) + .thenReturn(Arrays.asList(otherCharacterEntity, ownCharacterEntity)); } 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 2c74a707e..cc27d421f 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 @@ -112,8 +112,10 @@ public class ComponentSerializerTest { @Test public void testComponentTypeIdDeserializes() throws Exception { componentSerializer.setIdMapping(ImmutableMap., Integer>builder().put(StringComponent.class, 1).build()); - EntityData.Component compData = EntityData.Component.newBuilder().setTypeIndex(1) - .addField(EntityData.NameValue.newBuilder().setName("value").setValue(EntityData.Value.newBuilder().addString("item"))).build(); + EntityData.Component compData = EntityData.Component.newBuilder() + .setTypeIndex(1) + .addField(EntityData.NameValue.newBuilder().setName("value").setValue(EntityData.Value.newBuilder().addString("item"))) + .build(); Component comp = componentSerializer.deserialize(compData); assertTrue(comp instanceof StringComponent); assertEquals("item", ((StringComponent) comp).value); @@ -122,8 +124,10 @@ public class ComponentSerializerTest { @Test public void testDeltaComponentTypeIdDeserializesWithValue() throws Exception { componentSerializer.setIdMapping(ImmutableMap., Integer>builder().put(StringComponent.class, 1).build()); - EntityData.Component compData = EntityData.Component.newBuilder().setTypeIndex(1) - .addField(EntityData.NameValue.newBuilder().setName("value").setValue(EntityData.Value.newBuilder().addString("item"))).build(); + EntityData.Component compData = EntityData.Component.newBuilder() + .setTypeIndex(1) + .addField(EntityData.NameValue.newBuilder().setName("value").setValue(EntityData.Value.newBuilder().addString("item"))) + .build(); StringComponent original = new StringComponent("test"); componentSerializer.deserializeOnto(original, compData); assertEquals("item", original.value); @@ -132,7 +136,10 @@ public class ComponentSerializerTest { @Test public void testDeltaComponentTypeIdDeserializesWithoutValue() throws Exception { componentSerializer.setIdMapping(ImmutableMap., Integer>builder().put(StringComponent.class, 1).build()); - EntityData.Component compData = EntityData.Component.newBuilder().setTypeIndex(1).addField(EntityData.NameValue.newBuilder().setName("value")).build(); + EntityData.Component compData = EntityData.Component.newBuilder() + .setTypeIndex(1) + .addField(EntityData.NameValue.newBuilder().setName("value")) + .build(); StringComponent original = new StringComponent("test"); componentSerializer.deserializeOnto(original, compData); assertEquals(null, original.value); 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 69cadca00..346590c93 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 @@ -150,7 +150,10 @@ public class EntitySerializerTest { assertEquals(0, entityData.getRemovedComponentCount()); EntityData.Component componentData = entityData.getComponent(0); assertEquals("test:string", componentData.getType()); - assertEquals(Lists.newArrayList(EntityData.NameValue.newBuilder().setName("value").setValue(EntityData.Value.newBuilder().addString("Delta").build()).build()), + assertEquals(Lists.newArrayList(EntityData.NameValue.newBuilder() + .setName("value") + .setValue(EntityData.Value.newBuilder().addString("Delta").build()) + .build()), componentData.getFieldList()); } diff --git a/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/ColumnLayoutTest.java b/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/ColumnLayoutTest.java index b34d50767..ac17f8a62 100644 --- a/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/ColumnLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/ColumnLayoutTest.java @@ -95,20 +95,30 @@ public class ColumnLayoutTest { columnLayout.onDraw(canvas); // Gets half of entire area - verify(canvas).drawWidget(itemAt1x1, RectUtility.createFromMinAndSize(0, ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH / 2, 10)); + verify(canvas).drawWidget(itemAt1x1, + RectUtility.createFromMinAndSize(0, ((CANVAS_HEIGHT - 20) / 2), + CANVAS_WIDTH / 2, 10)); // Gets one-fifth of entire area - verify(canvas).drawWidget(itemAt2x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2, ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 2 / 10, 10)); + 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)); + 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)); + 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 @@ -123,13 +133,25 @@ public class ColumnLayoutTest { columnLayout.onDraw(canvas); - verify(canvas).drawWidget(itemAt1x1, RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2), ((CANVAS_HEIGHT - 20) / 2), 50, 10)); - verify(canvas).drawWidget(itemAt2x1, RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50, ((CANVAS_HEIGHT - 20) / 2), 5, 10)); - verify(canvas).drawWidget(itemAt3x1, RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50 + 5, ((CANVAS_HEIGHT - 20) / 2), 20, 10)); + verify(canvas).drawWidget(itemAt1x1, + RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2), ((CANVAS_HEIGHT - 20) / 2), + 50, 10)); + verify(canvas).drawWidget(itemAt2x1, + RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50, ((CANVAS_HEIGHT - 20) / 2), + 5, 10)); + verify(canvas).drawWidget(itemAt3x1, + RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50 + 5, ((CANVAS_HEIGHT - 20) / 2), + 20, 10)); - verify(canvas).drawWidget(itemAt1x2, RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2), ((CANVAS_HEIGHT - 20) / 2) + 10, 50, 10)); - verify(canvas).drawWidget(itemAt2x2, RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50, ((CANVAS_HEIGHT - 20) / 2) + 10, 5, 10)); - verify(canvas).drawWidget(itemAt3x2, RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50 + 5, ((CANVAS_HEIGHT - 20) / 2) + 10, 20, 10)); + verify(canvas).drawWidget(itemAt1x2, + RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2), ((CANVAS_HEIGHT - 20) / 2) + 10, + 50, 10)); + verify(canvas).drawWidget(itemAt2x2, + RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50, ((CANVAS_HEIGHT - 20) / 2) + 10, + 5, 10)); + verify(canvas).drawWidget(itemAt3x2, + RectUtility.createFromMinAndSize(((CANVAS_WIDTH - 75) / 2) + 50 + 5, ((CANVAS_HEIGHT - 20) / 2) + 10, + 20, 10)); } } diff --git a/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/RowLayoutTest.java b/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/RowLayoutTest.java index e39656a00..def880eda 100644 --- a/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/RowLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/rendering/nui/layouts/RowLayoutTest.java @@ -83,9 +83,12 @@ public class RowLayoutTest { // Gets 1/10 of the entire area final int width3 = CANVAS_WIDTH / 10; - verify(canvas).drawWidget(itemAt1x1, RectUtility.createFromMinAndSize(0, 0, width1, CANVAS_HEIGHT)); - verify(canvas).drawWidget(itemAt1x2, RectUtility.createFromMinAndSize(width1, 0, width2, CANVAS_HEIGHT)); - verify(canvas).drawWidget(itemAt1x3, RectUtility.createFromMinAndSize(width1 + width2, 0, width3, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x1, + RectUtility.createFromMinAndSize(0, 0, width1, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x2, + RectUtility.createFromMinAndSize(width1, 0, width2, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x3, + RectUtility.createFromMinAndSize(width1 + width2, 0, width3, CANVAS_HEIGHT)); } @Test @@ -103,9 +106,12 @@ public class RowLayoutTest { rowLayout.onDraw(canvas); //Width split equally among 3 widgets as they have no relative widths - verify(canvas).drawWidget(itemAt1x1, RectUtility.createFromMinAndSize(0, 0, CANVAS_WIDTH / 3, CANVAS_HEIGHT)); - verify(canvas).drawWidget(itemAt1x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 3, 0, CANVAS_WIDTH / 3, CANVAS_HEIGHT)); - verify(canvas).drawWidget(itemAt1x3, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 3 + CANVAS_WIDTH / 3, 0, CANVAS_WIDTH / 3, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x1, + RectUtility.createFromMinAndSize(0, 0, CANVAS_WIDTH / 3, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x2, + RectUtility.createFromMinAndSize(CANVAS_WIDTH / 3, 0, CANVAS_WIDTH / 3, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x3, + RectUtility.createFromMinAndSize(CANVAS_WIDTH / 3 + CANVAS_WIDTH / 3, 0, CANVAS_WIDTH / 3, CANVAS_HEIGHT)); } @Test @@ -129,8 +135,11 @@ public class RowLayoutTest { final int width2 = (CANVAS_WIDTH - width1) / 2; final int width3 = (CANVAS_WIDTH - width1) / 2; - verify(canvas).drawWidget(itemAt1x1, RectUtility.createFromMinAndSize(0, 0, width1, CANVAS_HEIGHT)); - verify(canvas).drawWidget(itemAt1x2, RectUtility.createFromMinAndSize(width1, 0, width2, CANVAS_HEIGHT)); - verify(canvas).drawWidget(itemAt1x3, RectUtility.createFromMinAndSize(width1 + width2, 0, width3, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x1, + RectUtility.createFromMinAndSize(0, 0, width1, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x2, + RectUtility.createFromMinAndSize(width1, 0, width2, CANVAS_HEIGHT)); + verify(canvas).drawWidget(itemAt1x3, + RectUtility.createFromMinAndSize(width1 + width2, 0, width3, CANVAS_HEIGHT)); } } diff --git a/engine-tests/src/test/java/org/terasology/engine/rendering/nui/widgets/treeView/GenericTreeTest.java b/engine-tests/src/test/java/org/terasology/engine/rendering/nui/widgets/treeView/GenericTreeTest.java index 4f534d959..e83619ac1 100644 --- a/engine-tests/src/test/java/org/terasology/engine/rendering/nui/widgets/treeView/GenericTreeTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/rendering/nui/widgets/treeView/GenericTreeTest.java @@ -103,7 +103,8 @@ public class GenericTreeTest { @Test public void testDepthFirstIteratorIterateExpandedOnly() { - List> expected = Arrays.asList(nodes.get(0), nodes.get(1), nodes.get(2), nodes.get(4), nodes.get(5), nodes.get(6), nodes.get(9)); + List> expected = Arrays.asList(nodes.get(0), nodes.get(1), nodes.get(2), + nodes.get(4), nodes.get(5), nodes.get(6), nodes.get(9)); List> actual = Lists.newArrayList(); Iterator i = nodes.get(0).getDepthFirstIterator(true); diff --git a/engine-tests/src/test/java/org/terasology/engine/world/ChunkTest.java b/engine-tests/src/test/java/org/terasology/engine/world/ChunkTest.java index ad2b8cb0b..182fa1358 100644 --- a/engine-tests/src/test/java/org/terasology/engine/world/ChunkTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/world/ChunkTest.java @@ -65,7 +65,8 @@ public class ChunkTest extends TerasologyTestingEnvironment { public void testGetAabb() { AABBfc aabb = chunk.getAABB(); assertEquals(new Vector3f(-.5f, -.5f, -.5f), new Vector3f(aabb.minX(), aabb.minY(), aabb.minZ())); - assertEquals(new Vector3f(Chunks.SIZE_X - .5f, Chunks.SIZE_Y - .5f, Chunks.SIZE_Z - .5f), new Vector3f(aabb.maxX(), aabb.maxY(), aabb.maxZ())); + assertEquals(new Vector3f(Chunks.SIZE_X - .5f, Chunks.SIZE_Y - .5f, Chunks.SIZE_Z - .5f), + new Vector3f(aabb.maxX(), aabb.maxY(), aabb.maxZ())); } } diff --git a/engine-tests/src/test/java/org/terasology/engine/world/EntityAwareWorldProviderTest.java b/engine-tests/src/test/java/org/terasology/engine/world/EntityAwareWorldProviderTest.java index b1bcafd9d..2fab36367 100644 --- a/engine-tests/src/test/java/org/terasology/engine/world/EntityAwareWorldProviderTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/world/EntityAwareWorldProviderTest.java @@ -90,7 +90,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { blockWithString = createBlockWithPrefab("test:blockWithString", prefabWithString, false, assetManager, blockManager); keepActiveBlock = createBlockWithPrefab("test:keepActiveBlock", prefabWithString, true, assetManager, blockManager); Prefab prefabWithDifferentString = createPrefabWithString("test:prefabWithDifferentString", "Test2", assetManager); - blockWithDifferentString = createBlockWithPrefab("test:prefabWithDifferentString", prefabWithDifferentString, false, assetManager, blockManager); + blockWithDifferentString = createBlockWithPrefab("test:prefabWithDifferentString", prefabWithDifferentString, + false, assetManager, blockManager); BlockFamily blockFamily = createBlockFamily("test:blockFamily", prefabWithString, assetManager, blockManager); Iterator iterator = blockFamily.getBlocks().iterator(); @@ -101,7 +102,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { retainedPrefabData.addComponent(new RetainedOnBlockChangeComponent(3)); Prefab retainedPrefab = assetManager.loadAsset(new ResourceUrn("test:retainedPrefab"), retainedPrefabData, Prefab.class); - blockWithRetainedComponent = createBlockWithPrefab("test:blockWithRetainedComponent", retainedPrefab, false, assetManager, blockManager); + blockWithRetainedComponent = createBlockWithPrefab("test:blockWithRetainedComponent", retainedPrefab, + false, assetManager, blockManager); worldProvider.initialise(); } @@ -189,8 +191,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { EntityRef blockEntity = worldProvider.getBlockEntityAt(new Vector3i()); assertTrue(blockEntity.exists()); - assertEquals(Lists.newArrayList(new EventInfo(OnAddedComponent.newInstance(), blockEntity), new EventInfo(OnActivatedComponent.newInstance(), blockEntity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(OnAddedComponent.newInstance(), blockEntity), + new EventInfo(OnActivatedComponent.newInstance(), blockEntity)), checker.receivedEvents); } @Disabled("Failing due to #2625. TODO: fix to match new behaviour") @@ -204,8 +206,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { EntityRef blockEntity = worldProvider.getBlockEntityAt(new Vector3i()); assertTrue(blockEntity.exists()); - assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), blockEntity), new EventInfo(BeforeRemoveComponent.newInstance(), blockEntity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), blockEntity), + new EventInfo(BeforeRemoveComponent.newInstance(), blockEntity)), checker.receivedEvents); } @Disabled("Failing due to #2625. TODO: fix to match new behaviour") @@ -227,7 +229,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { worldProvider.setBlock(new Vector3i(), blockWithString); assertEquals(blockWithString.getPrefab().get().getName(), worldProvider.getBlockEntityAt(new Vector3i()).getParentPrefab().getName()); worldProvider.setBlock(new Vector3i(), blockWithDifferentString); - assertEquals(blockWithDifferentString.getPrefab().get().getName(), worldProvider.getBlockEntityAt(new Vector3i()).getParentPrefab().getName()); + assertEquals(blockWithDifferentString.getPrefab().get().getName(), + worldProvider.getBlockEntityAt(new Vector3i()).getParentPrefab().getName()); } @Test @@ -287,8 +290,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { LifecycleEventChecker checker = new LifecycleEventChecker(entityManager.getEventSystem(), StringComponent.class); worldProvider.update(1.0f); - assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), entity), new EventInfo(BeforeRemoveComponent.newInstance(), entity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), entity), + new EventInfo(BeforeRemoveComponent.newInstance(), entity)), checker.receivedEvents); } @Test @@ -300,8 +303,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { LifecycleEventChecker checker = new LifecycleEventChecker(entityManager.getEventSystem(), IntegerComponent.class); worldProvider.update(1.0f); - assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), entity), new EventInfo(BeforeRemoveComponent.newInstance(), entity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), entity), + new EventInfo(BeforeRemoveComponent.newInstance(), entity)), checker.receivedEvents); } @Test @@ -313,8 +316,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { LifecycleEventChecker checker = new LifecycleEventChecker(entityManager.getEventSystem(), StringComponent.class); worldProvider.update(1.0f); - assertEquals(Lists.newArrayList(new EventInfo(OnAddedComponent.newInstance(), entity), new EventInfo(OnActivatedComponent.newInstance(), entity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(OnAddedComponent.newInstance(), entity), + new EventInfo(OnActivatedComponent.newInstance(), entity)), checker.receivedEvents); } @Test @@ -360,8 +363,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { EntityRef entity = worldProvider.getBlockEntityAt(new Vector3i()); entity.addComponent(new RetainedOnBlockChangeComponent(2)); - assertEquals(Lists.newArrayList(new EventInfo(OnAddedComponent.newInstance(), entity), new EventInfo(OnActivatedComponent.newInstance(), entity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(OnAddedComponent.newInstance(), entity), + new EventInfo(OnActivatedComponent.newInstance(), entity)), checker.receivedEvents); assertTrue(entity.hasComponent(NetworkComponent.class)); } @@ -375,8 +378,8 @@ public class EntityAwareWorldProviderTest extends TerasologyTestingEnvironment { worldProvider.update(1.0f); - assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), entity), new EventInfo(BeforeRemoveComponent.newInstance(), entity)), - checker.receivedEvents); + assertEquals(Lists.newArrayList(new EventInfo(BeforeDeactivateComponent.newInstance(), entity), + new EventInfo(BeforeRemoveComponent.newInstance(), entity)), checker.receivedEvents); } @Test diff --git a/engine-tests/src/test/java/org/terasology/engine/world/chunks/pipeline/ChunkProcessingPipelineTest.java b/engine-tests/src/test/java/org/terasology/engine/world/chunks/pipeline/ChunkProcessingPipelineTest.java index 4db81bbb9..a4f11bfe0 100644 --- a/engine-tests/src/test/java/org/terasology/engine/world/chunks/pipeline/ChunkProcessingPipelineTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/world/chunks/pipeline/ChunkProcessingPipelineTest.java @@ -171,7 +171,8 @@ class ChunkProcessingPipelineTest extends TerasologyTestingEnvironment { pipeline = new ChunkProcessingPipeline(chunkCache::get, (o1, o2) -> { if (position.get() != null) { Vector3ic entityPos = position.get(); - return (int) (entityPos.distance(((PositionFuture) o1).getPosition()) - entityPos.distance(((PositionFuture) o2).getPosition())); + return (int) (entityPos.distance(((PositionFuture) o1).getPosition()) + - entityPos.distance(((PositionFuture) o2).getPosition())); } return 0; }); 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 3e15c3c52..09e653ebe 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 @@ -4,12 +4,12 @@ package org.terasology.reflection.reflect; import org.joml.Vector3f; import org.junit.jupiter.api.Test; +import org.terasology.engine.logic.characters.events.AttackRequest; +import org.terasology.engine.logic.location.LocationComponent; +import org.terasology.engine.reflection.reflect.ByteCodeReflectFactory; import org.terasology.unittest.stubs.GetterSetterComponent; import org.terasology.unittest.stubs.IntegerComponent; import org.terasology.unittest.stubs.StringComponent; -import org.terasology.engine.reflection.reflect.ByteCodeReflectFactory; -import org.terasology.engine.logic.characters.events.AttackRequest; -import org.terasology.engine.logic.location.LocationComponent; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -36,8 +36,8 @@ public class ByteCodeReflectFactoryTest { @Test public void testCreateFieldAccessorWithGetterSetter() throws Exception { ReflectFactory reflectFactory = new ByteCodeReflectFactory(); - FieldAccessor fieldAccessor - = reflectFactory.createFieldAccessor(GetterSetterComponent.class, GetterSetterComponent.class.getDeclaredField("value"), Vector3f.class); + FieldAccessor fieldAccessor = reflectFactory.createFieldAccessor(GetterSetterComponent.class, + GetterSetterComponent.class.getDeclaredField("value"), Vector3f.class); GetterSetterComponent comp = new GetterSetterComponent(); Vector3f newVal = new Vector3f(1, 2, 3); fieldAccessor.setValue(comp, newVal); 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 99df57425..b132aa762 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java @@ -21,93 +21,109 @@ public class MersenneRandomTest { */ private static final long[] FIRST_1000_VALS = { - 1067595299L, 955945823L, 477289528L, 4107218783L, 4228976476L, 3344332714L, 3355579695L, 227628506L, 810200273L, 2591290167L, 2560260675L, 3242736208L, 646746669L, - 1479517882L, 4245472273L, 1143372638L, 3863670494L, 3221021970L, 1773610557L, 1138697238L, 1421897700L, 1269916527L, 2859934041L, 1764463362L, 3874892047L, - 3965319921L, 72549643L, 2383988930L, 2600218693L, 3237492380L, 2792901476L, 725331109L, 605841842L, 271258942L, 715137098L, 3297999536L, 1322965544L, 4229579109L, - 1395091102L, 3735697720L, 2101727825L, 3730287744L, 2950434330L, 1661921839L, 2895579582L, 2370511479L, 1004092106L, 2247096681L, 2111242379L, 3237345263L, - 4082424759L, 219785033L, 2454039889L, 3709582971L, 835606218L, 2411949883L, 2735205030L, 756421180L, 2175209704L, 1873865952L, 2762534237L, 4161807854L, - 3351099340L, 181129879L, 3269891896L, 776029799L, 2218161979L, 3001745796L, 1866825872L, 2133627728L, 34862734L, 1191934573L, 3102311354L, 2916517763L, - 1012402762L, 2184831317L, 4257399449L, 2899497138L, 3818095062L, 3030756734L, 1282161629L, 420003642L, 2326421477L, 2741455717L, 1278020671L, 3744179621L, - 271777016L, 2626330018L, 2560563991L, 3055977700L, 4233527566L, 1228397661L, 3595579322L, 1077915006L, 2395931898L, 1851927286L, 3013683506L, 1999971931L, - 3006888962L, 1049781534L, 1488758959L, 3491776230L, 104418065L, 2448267297L, 3075614115L, 3872332600L, 891912190L, 3936547759L, 2269180963L, 2633455084L, - 1047636807L, 2604612377L, 2709305729L, 1952216715L, 207593580L, 2849898034L, 670771757L, 2210471108L, 467711165L, 263046873L, 3569667915L, 1042291111L, - 3863517079L, 1464270005L, 2758321352L, 3790799816L, 2301278724L, 3106281430L, 7974801L, 2792461636L, 555991332L, 621766759L, 1322453093L, 853629228L, 686962251L, - 1455120532L, 957753161L, 1802033300L, 1021534190L, 3486047311L, 1902128914L, 3701138056L, 4176424663L, 1795608698L, 560858864L, 3737752754L, 3141170998L, - 1553553385L, 3367807274L, 711546358L, 2475125503L, 262969859L, 251416325L, 2980076994L, 1806565895L, 969527843L, 3529327173L, 2736343040L, 2987196734L, - 1649016367L, 2206175811L, 3048174801L, 3662503553L, 3138851612L, 2660143804L, 1663017612L, 1816683231L, 411916003L, 3887461314L, 2347044079L, 1015311755L, - 1203592432L, 2170947766L, 2569420716L, 813872093L, 1105387678L, 1431142475L, 220570551L, 4243632715L, 4179591855L, 2607469131L, 3090613241L, 282341803L, - 1734241730L, 1391822177L, 1001254810L, 827927915L, 1886687171L, 3935097347L, 2631788714L, 3905163266L, 110554195L, 2447955646L, 3717202975L, 3304793075L, - 3739614479L, 3059127468L, 953919171L, 2590123714L, 1132511021L, 3795593679L, 2788030429L, 982155079L, 3472349556L, 859942552L, 2681007391L, 2299624053L, - 647443547L, 233600422L, 608168955L, 3689327453L, 1849778220L, 1608438222L, 3968158357L, 2692977776L, 2851872572L, 246750393L, 3582818628L, 3329652309L, - 4036366910L, 1012970930L, 950780808L, 3959768744L, 2538550045L, 191422718L, 2658142375L, 3276369011L, 2927737484L, 1234200027L, 1920815603L, 3536074689L, - 1535612501L, 2184142071L, 3276955054L, 428488088L, 2378411984L, 4059769550L, 3913744741L, 2732139246L, 64369859L, 3755670074L, 842839565L, 2819894466L, - 2414718973L, 1010060670L, 1839715346L, 2410311136L, 152774329L, 3485009480L, 4102101512L, 2852724304L, 879944024L, 1785007662L, 2748284463L, 1354768064L, - 3267784736L, 2269127717L, 3001240761L, 3179796763L, 895723219L, 865924942L, 4291570937L, 89355264L, 1471026971L, 4114180745L, 3201939751L, 2867476999L, - 2460866060L, 3603874571L, 2238880432L, 3308416168L, 2072246611L, 2755653839L, 3773737248L, 1709066580L, 4282731467L, 2746170170L, 2832568330L, 433439009L, - 3175778732L, 26248366L, 2551382801L, 183214346L, 3893339516L, 1928168445L, 1337157619L, 3429096554L, 3275170900L, 1782047316L, 4264403756L, 1876594403L, - 4289659572L, 3223834894L, 1728705513L, 4068244734L, 2867840287L, 1147798696L, 302879820L, 1730407747L, 1923824407L, 1180597908L, 1569786639L, 198796327L, - 560793173L, 2107345620L, 2705990316L, 3448772106L, 3678374155L, 758635715L, 884524671L, 486356516L, 1774865603L, 3881226226L, 2635213607L, 1181121587L, - 1508809820L, 3178988241L, 1594193633L, 1235154121L, 326117244L, 2304031425L, 937054774L, 2687415945L, 3192389340L, 2003740439L, 1823766188L, 2759543402L, - 10067710L, 1533252662L, 4132494984L, 82378136L, 420615890L, 3467563163L, 541562091L, 3535949864L, 2277319197L, 3330822853L, 3215654174L, 4113831979L, 4204996991L, - 2162248333L, 3255093522L, 2219088909L, 2978279037L, 255818579L, 2859348628L, 3097280311L, 2569721123L, 1861951120L, 2907080079L, 2719467166L, 998319094L, - 2521935127L, 2404125338L, 259456032L, 2086860995L, 1839848496L, 1893547357L, 2527997525L, 1489393124L, 2860855349L, 76448234L, 2264934035L, 744914583L, - 2586791259L, 1385380501L, 66529922L, 1819103258L, 1899300332L, 2098173828L, 1793831094L, 276463159L, 360132945L, 4178212058L, 595015228L, 177071838L, 2800080290L, - 1573557746L, 1548998935L, 378454223L, 1460534296L, 1116274283L, 3112385063L, 3709761796L, 827999348L, 3580042847L, 1913901014L, 614021289L, 4278528023L, - 1905177404L, 45407939L, 3298183234L, 1184848810L, 3644926330L, 3923635459L, 1627046213L, 3677876759L, 969772772L, 1160524753L, 1522441192L, 452369933L, - 1527502551L, 832490847L, 1003299676L, 1071381111L, 2891255476L, 973747308L, 4086897108L, 1847554542L, 3895651598L, 2227820339L, 1621250941L, 2881344691L, - 3583565821L, 3510404498L, 849362119L, 862871471L, 797858058L, 2867774932L, 2821282612L, 3272403146L, 3997979905L, 209178708L, 1805135652L, 6783381L, 2823361423L, - 792580494L, 4263749770L, 776439581L, 3798193823L, 2853444094L, 2729507474L, 1071873341L, 1329010206L, 1289336450L, 3327680758L, 2011491779L, 80157208L, - 922428856L, 1158943220L, 1667230961L, 2461022820L, 2608845159L, 387516115L, 3345351910L, 1495629111L, 4098154157L, 3156649613L, 3525698599L, 4134908037L, - 446713264L, 2137537399L, 3617403512L, 813966752L, 1157943946L, 3734692965L, 1680301658L, 3180398473L, 3509854711L, 2228114612L, 1008102291L, 486805123L, - 863791847L, 3189125290L, 1050308116L, 3777341526L, 4291726501L, 844061465L, 1347461791L, 2826481581L, 745465012L, 2055805750L, 4260209475L, 2386693097L, - 2980646741L, 447229436L, 2077782664L, 1232942813L, 4023002732L, 1399011509L, 3140569849L, 2579909222L, 3794857471L, 900758066L, 2887199683L, 1720257997L, - 3367494931L, 2668921229L, 955539029L, 3818726432L, 1105704962L, 3889207255L, 2277369307L, 2746484505L, 1761846513L, 2413916784L, 2685127085L, 4240257943L, - 1166726899L, 4215215715L, 3082092067L, 3960461946L, 1663304043L, 2087473241L, 4162589986L, 2507310778L, 1579665506L, 767234210L, 970676017L, 492207530L, - 1441679602L, 1314785090L, 3262202570L, 3417091742L, 1561989210L, 3011406780L, 1146609202L, 3262321040L, 1374872171L, 1634688712L, 1280458888L, 2230023982L, - 419323804L, 3262899800L, 39783310L, 1641619040L, 1700368658L, 2207946628L, 2571300939L, 2424079766L, 780290914L, 2715195096L, 3390957695L, 163151474L, - 2309534542L, 1860018424L, 555755123L, 280320104L, 1604831083L, 2713022383L, 1728987441L, 3639955502L, 623065489L, 3828630947L, 4275479050L, 3516347383L, - 2343951195L, 2430677756L, 635534992L, 3868699749L, 808442435L, 3070644069L, 4282166003L, 2093181383L, 2023555632L, 1568662086L, 3422372620L, 4134522350L, - 3016979543L, 3259320234L, 2888030729L, 3185253876L, 4258779643L, 1267304371L, 1022517473L, 815943045L, 929020012L, 2995251018L, 3371283296L, 3608029049L, - 2018485115L, 122123397L, 2810669150L, 1411365618L, 1238391329L, 1186786476L, 3155969091L, 2242941310L, 1765554882L, 279121160L, 4279838515L, 1641578514L, - 3796324015L, 13351065L, 103516986L, 1609694427L, 551411743L, 2493771609L, 1316337047L, 3932650856L, 4189700203L, 463397996L, 2937735066L, 1855616529L, - 2626847990L, 55091862L, 3823351211L, 753448970L, 4045045500L, 1274127772L, 1124182256L, 92039808L, 2126345552L, 425973257L, 386287896L, 2589870191L, 1987762798L, - 4084826973L, 2172456685L, 3366583455L, 3602966653L, 2378803535L, 2901764433L, 3716929006L, 3710159000L, 2653449155L, 3469742630L, 3096444476L, 3932564653L, - 2595257433L, 318974657L, 3146202484L, 853571438L, 144400272L, 3768408841L, 782634401L, 2161109003L, 570039522L, 1886241521L, 14249488L, 2230804228L, 1604941699L, - 3928713335L, 3921942509L, 2155806892L, 134366254L, 430507376L, 1924011722L, 276713377L, 196481886L, 3614810992L, 1610021185L, 1785757066L, 851346168L, - 3761148643L, 2918835642L, 3364422385L, 3012284466L, 3735958851L, 2643153892L, 3778608231L, 1164289832L, 205853021L, 2876112231L, 3503398282L, 3078397001L, - 3472037921L, 1748894853L, 2740861475L, 316056182L, 1660426908L, 168885906L, 956005527L, 3984354789L, 566521563L, 1001109523L, 1216710575L, 2952284757L, - 3834433081L, 3842608301L, 2467352408L, 3974441264L, 3256601745L, 1409353924L, 1329904859L, 2307560293L, 3125217879L, 3622920184L, 3832785684L, 3882365951L, - 2308537115L, 2659155028L, 1450441945L, 3532257603L, 3186324194L, 1225603425L, 1124246549L, 175808705L, 3009142319L, 2796710159L, 3651990107L, 160762750L, - 1902254979L, 1698648476L, 1134980669L, 497144426L, 3302689335L, 4057485630L, 3603530763L, 4087252587L, 427812652L, 286876201L, 823134128L, 1627554964L, - 3745564327L, 2589226092L, 4202024494L, 62878473L, 3275585894L, 3987124064L, 2791777159L, 1916869511L, 2585861905L, 1375038919L, 1403421920L, 60249114L, - 3811870450L, 3021498009L, 2612993202L, 528933105L, 2757361321L, 3341402964L, 2621861700L, 273128190L, 4015252178L, 3094781002L, 1621621288L, 2337611177L, - 1796718448L, 1258965619L, 4241913140L, 2138560392L, 3022190223L, 4174180924L, 450094611L, 3274724580L, 617150026L, 2704660665L, 1469700689L, 1341616587L, - 356715071L, 1188789960L, 2278869135L, 1766569160L, 2795896635L, 57824704L, 2893496380L, 1235723989L, 1630694347L, 3927960522L, 428891364L, 1814070806L, - 2287999787L, 4125941184L, 3968103889L, 3548724050L, 1025597707L, 1404281500L, 2002212197L, 92429143L, 2313943944L, 2403086080L, 3006180634L, 3561981764L, - 1671860914L, 1768520622L, 1803542985L, 844848113L, 3006139921L, 1410888995L, 1157749833L, 2125704913L, 1789979528L, 1799263423L, 741157179L, 2405862309L, - 767040434L, 2655241390L, 3663420179L, 2172009096L, 2511931187L, 1680542666L, 231857466L, 1154981000L, 157168255L, 1454112128L, 3505872099L, 1929775046L, - 2309422350L, 2143329496L, 2960716902L, 407610648L, 2938108129L, 2581749599L, 538837155L, 2342628867L, 430543915L, 740188568L, 1937713272L, 3315215132L, - 2085587024L, 4030765687L, 766054429L, 3517641839L, 689721775L, 1294158986L, 1753287754L, 4202601348L, 1974852792L, 33459103L, 3568087535L, 3144677435L, - 1686130825L, 4134943013L, 3005738435L, 3599293386L, 426570142L, 754104406L, 3660892564L, 1964545167L, 829466833L, 821587464L, 1746693036L, 1006492428L, - 1595312919L, 1256599985L, 1024482560L, 1897312280L, 2902903201L, 691790057L, 1037515867L, 3176831208L, 1968401055L, 2173506824L, 1089055278L, 1748401123L, - 2941380082L, 968412354L, 1818753861L, 2973200866L, 3875951774L, 1119354008L, 3988604139L, 1647155589L, 2232450826L, 3486058011L, 3655784043L, 3759258462L, - 847163678L, 1082052057L, 989516446L, 2871541755L, 3196311070L, 3929963078L, 658187585L, 3664944641L, 2175149170L, 2203709147L, 2756014689L, 2456473919L, - 3890267390L, 1293787864L, 2830347984L, 3059280931L, 4158802520L, 1561677400L, 2586570938L, 783570352L, 1355506163L, 31495586L, 3789437343L, 3340549429L, - 2092501630L, 896419368L, 671715824L, 3530450081L, 3603554138L, 1055991716L, 3442308219L, 1499434728L, 3130288473L, 3639507000L, 17769680L, 2259741420L, - 487032199L, 4227143402L, 3693771256L, 1880482820L, 3924810796L, 381462353L, 4017855991L, 2452034943L, 2736680833L, 2209866385L, 2128986379L, 437874044L, - 595759426L, 641721026L, 1636065708L, 3899136933L, 629879088L, 3591174506L, 351984326L, 2638783544L, 2348444281L, 2341604660L, 2123933692L, 143443325L, - 1525942256L, 364660499L, 599149312L, 939093251L, 1523003209L, 106601097L, 376589484L, 1346282236L, 1297387043L, 764598052L, 3741218111L, 933457002L, 1886424424L, - 3219631016L, 525405256L, 3014235619L, 323149677L, 2038881721L, 4100129043L, 2851715101L, 2984028078L, 1888574695L, 2014194741L, 3515193880L, 4180573530L, - 3461824363L, 2641995497L, 3179230245L, 2902294983L, 2217320456L, 4040852155L, 1784656905L, 3311906931L, 87498458L, 2752971818L, 2635474297L, 2831215366L, - 3682231106L, 2920043893L, 3772929704L, 2816374944L, 309949752L, 2383758854L, 154870719L, 385111597L, 1191604312L, 1840700563L, 872191186L, 2925548701L, - 1310412747L, 2102066999L, 1504727249L, 3574298750L, 1191230036L, 3330575266L, 3180292097L, 3539347721L, 681369118L, 3305125752L, 3648233597L, 950049240L, - 4173257693L, 1760124957L, 512151405L, 681175196L, 580563018L, 1169662867L, 4015033554L, 2687781101L, 699691603L, 2673494188L, 1137221356L, 123599888L, 472658308L, - 1053598179L, 1012713758L, 3481064843L, 3759461013L, 3981457956L, 3830587662L, 1877191791L, 3650996736L, 988064871L, 3515461600L, 4089077232L, 2225147448L, - 1249609188L, 2643151863L, 3896204135L, 2416995901L, 1397735321L, 3460025646L}; + 1067595299L, 955945823L, 477289528L, 4107218783L, 4228976476L, 3344332714L, 3355579695L, 227628506L, 810200273L, 2591290167L, + 2560260675L, 3242736208L, 646746669L, 1479517882L, 4245472273L, 1143372638L, 3863670494L, 3221021970L, 1773610557L, 1138697238L, + 1421897700L, 1269916527L, 2859934041L, 1764463362L, 3874892047L, 3965319921L, 72549643L, 2383988930L, 2600218693L, 3237492380L, + 2792901476L, 725331109L, 605841842L, 271258942L, 715137098L, 3297999536L, 1322965544L, 4229579109L, 1395091102L, 3735697720L, + 2101727825L, 3730287744L, 2950434330L, 1661921839L, 2895579582L, 2370511479L, 1004092106L, 2247096681L, 2111242379L, 3237345263L, + 4082424759L, 219785033L, 2454039889L, 3709582971L, 835606218L, 2411949883L, 2735205030L, 756421180L, 2175209704L, 1873865952L, + 2762534237L, 4161807854L, 3351099340L, 181129879L, 3269891896L, 776029799L, 2218161979L, 3001745796L, 1866825872L, 2133627728L, + 34862734L, 1191934573L, 3102311354L, 2916517763L, 1012402762L, 2184831317L, 4257399449L, 2899497138L, 3818095062L, 3030756734L, + 1282161629L, 420003642L, 2326421477L, 2741455717L, 1278020671L, 3744179621L, 271777016L, 2626330018L, 2560563991L, 3055977700L, + 4233527566L, 1228397661L, 3595579322L, 1077915006L, 2395931898L, 1851927286L, 3013683506L, 1999971931L, 3006888962L, 1049781534L, + 1488758959L, 3491776230L, 104418065L, 2448267297L, 3075614115L, 3872332600L, 891912190L, 3936547759L, 2269180963L, 2633455084L, + 1047636807L, 2604612377L, 2709305729L, 1952216715L, 207593580L, 2849898034L, 670771757L, 2210471108L, 467711165L, 263046873L, + 3569667915L, 1042291111L, 3863517079L, 1464270005L, 2758321352L, 3790799816L, 2301278724L, 3106281430L, 7974801L, 2792461636L, + 555991332L, 621766759L, 1322453093L, 853629228L, 686962251L, 1455120532L, 957753161L, 1802033300L, 1021534190L, 3486047311L, + 1902128914L, 3701138056L, 4176424663L, 1795608698L, 560858864L, 3737752754L, 3141170998L, 1553553385L, 3367807274L, 711546358L, + 2475125503L, 262969859L, 251416325L, 2980076994L, 1806565895L, 969527843L, 3529327173L, 2736343040L, 2987196734L, 1649016367L, + 2206175811L, 3048174801L, 3662503553L, 3138851612L, 2660143804L, 1663017612L, 1816683231L, 411916003L, 3887461314L, 2347044079L, + 1015311755L, 1203592432L, 2170947766L, 2569420716L, 813872093L, 1105387678L, 1431142475L, 220570551L, 4243632715L, 4179591855L, + 2607469131L, 3090613241L, 282341803L, 1734241730L, 1391822177L, 1001254810L, 827927915L, 1886687171L, 3935097347L, 2631788714L, + 3905163266L, 110554195L, 2447955646L, 3717202975L, 3304793075L, 3739614479L, 3059127468L, 953919171L, 2590123714L, 1132511021L, + 3795593679L, 2788030429L, 982155079L, 3472349556L, 859942552L, 2681007391L, 2299624053L, 647443547L, 233600422L, 608168955L, + 3689327453L, 1849778220L, 1608438222L, 3968158357L, 2692977776L, 2851872572L, 246750393L, 3582818628L, 3329652309L, 4036366910L, + 1012970930L, 950780808L, 3959768744L, 2538550045L, 191422718L, 2658142375L, 3276369011L, 2927737484L, 1234200027L, 1920815603L, + 3536074689L, 1535612501L, 2184142071L, 3276955054L, 428488088L, 2378411984L, 4059769550L, 3913744741L, 2732139246L, 64369859L, + 3755670074L, 842839565L, 2819894466L, 2414718973L, 1010060670L, 1839715346L, 2410311136L, 152774329L, 3485009480L, 4102101512L, + 2852724304L, 879944024L, 1785007662L, 2748284463L, 1354768064L, 3267784736L, 2269127717L, 3001240761L, 3179796763L, 895723219L, + 865924942L, 4291570937L, 89355264L, 1471026971L, 4114180745L, 3201939751L, 2867476999L, 2460866060L, 3603874571L, 2238880432L, + 3308416168L, 2072246611L, 2755653839L, 3773737248L, 1709066580L, 4282731467L, 2746170170L, 2832568330L, 433439009L, 3175778732L, + 26248366L, 2551382801L, 183214346L, 3893339516L, 1928168445L, 1337157619L, 3429096554L, 3275170900L, 1782047316L, 4264403756L, + 1876594403L, 4289659572L, 3223834894L, 1728705513L, 4068244734L, 2867840287L, 1147798696L, 302879820L, 1730407747L, 1923824407L, + 1180597908L, 1569786639L, 198796327L, 560793173L, 2107345620L, 2705990316L, 3448772106L, 3678374155L, 758635715L, 884524671L, + 486356516L, 1774865603L, 3881226226L, 2635213607L, 1181121587L, 1508809820L, 3178988241L, 1594193633L, 1235154121L, 326117244L, + 2304031425L, 937054774L, 2687415945L, 3192389340L, 2003740439L, 1823766188L, 2759543402L, 10067710L, 1533252662L, 4132494984L, + 82378136L, 420615890L, 3467563163L, 541562091L, 3535949864L, 2277319197L, 3330822853L, 3215654174L, 4113831979L, 4204996991L, + 2162248333L, 3255093522L, 2219088909L, 2978279037L, 255818579L, 2859348628L, 3097280311L, 2569721123L, 1861951120L, 2907080079L, + 2719467166L, 998319094L, 2521935127L, 2404125338L, 259456032L, 2086860995L, 1839848496L, 1893547357L, 2527997525L, 1489393124L, + 2860855349L, 76448234L, 2264934035L, 744914583L, 2586791259L, 1385380501L, 66529922L, 1819103258L, 1899300332L, 2098173828L, + 1793831094L, 276463159L, 360132945L, 4178212058L, 595015228L, 177071838L, 2800080290L, 1573557746L, 1548998935L, 378454223L, + 1460534296L, 1116274283L, 3112385063L, 3709761796L, 827999348L, 3580042847L, 1913901014L, 614021289L, 4278528023L, 1905177404L, + 45407939L, 3298183234L, 1184848810L, 3644926330L, 3923635459L, 1627046213L, 3677876759L, 969772772L, 1160524753L, 1522441192L, + 452369933L, 1527502551L, 832490847L, 1003299676L, 1071381111L, 2891255476L, 973747308L, 4086897108L, 1847554542L, 3895651598L, + 2227820339L, 1621250941L, 2881344691L, 3583565821L, 3510404498L, 849362119L, 862871471L, 797858058L, 2867774932L, 2821282612L, + 3272403146L, 3997979905L, 209178708L, 1805135652L, 6783381L, 2823361423L, 792580494L, 4263749770L, 776439581L, 3798193823L, + 2853444094L, 2729507474L, 1071873341L, 1329010206L, 1289336450L, 3327680758L, 2011491779L, 80157208L, 922428856L, 1158943220L, + 1667230961L, 2461022820L, 2608845159L, 387516115L, 3345351910L, 1495629111L, 4098154157L, 3156649613L, 3525698599L, 4134908037L, + 446713264L, 2137537399L, 3617403512L, 813966752L, 1157943946L, 3734692965L, 1680301658L, 3180398473L, 3509854711L, 2228114612L, + 1008102291L, 486805123L, 863791847L, 3189125290L, 1050308116L, 3777341526L, 4291726501L, 844061465L, 1347461791L, 2826481581L, + 745465012L, 2055805750L, 4260209475L, 2386693097L, 2980646741L, 447229436L, 2077782664L, 1232942813L, 4023002732L, 1399011509L, + 3140569849L, 2579909222L, 3794857471L, 900758066L, 2887199683L, 1720257997L, 3367494931L, 2668921229L, 955539029L, 3818726432L, + 1105704962L, 3889207255L, 2277369307L, 2746484505L, 1761846513L, 2413916784L, 2685127085L, 4240257943L, 1166726899L, 4215215715L, + 3082092067L, 3960461946L, 1663304043L, 2087473241L, 4162589986L, 2507310778L, 1579665506L, 767234210L, 970676017L, 492207530L, + 1441679602L, 1314785090L, 3262202570L, 3417091742L, 1561989210L, 3011406780L, 1146609202L, 3262321040L, 1374872171L, 1634688712L, + 1280458888L, 2230023982L, 419323804L, 3262899800L, 39783310L, 1641619040L, 1700368658L, 2207946628L, 2571300939L, 2424079766L, + 780290914L, 2715195096L, 3390957695L, 163151474L, 2309534542L, 1860018424L, 555755123L, 280320104L, 1604831083L, 2713022383L, + 1728987441L, 3639955502L, 623065489L, 3828630947L, 4275479050L, 3516347383L, 2343951195L, 2430677756L, 635534992L, 3868699749L, + 808442435L, 3070644069L, 4282166003L, 2093181383L, 2023555632L, 1568662086L, 3422372620L, 4134522350L, 3016979543L, 3259320234L, + 2888030729L, 3185253876L, 4258779643L, 1267304371L, 1022517473L, 815943045L, 929020012L, 2995251018L, 3371283296L, 3608029049L, + 2018485115L, 122123397L, 2810669150L, 1411365618L, 1238391329L, 1186786476L, 3155969091L, 2242941310L, 1765554882L, 279121160L, + 4279838515L, 1641578514L, 3796324015L, 13351065L, 103516986L, 1609694427L, 551411743L, 2493771609L, 1316337047L, 3932650856L, + 4189700203L, 463397996L, 2937735066L, 1855616529L, 2626847990L, 55091862L, 3823351211L, 753448970L, 4045045500L, 1274127772L, + 1124182256L, 92039808L, 2126345552L, 425973257L, 386287896L, 2589870191L, 1987762798L, 4084826973L, 2172456685L, 3366583455L, + 3602966653L, 2378803535L, 2901764433L, 3716929006L, 3710159000L, 2653449155L, 3469742630L, 3096444476L, 3932564653L, 2595257433L, + 318974657L, 3146202484L, 853571438L, 144400272L, 3768408841L, 782634401L, 2161109003L, 570039522L, 1886241521L, 14249488L, + 2230804228L, 1604941699L, 3928713335L, 3921942509L, 2155806892L, 134366254L, 430507376L, 1924011722L, 276713377L, 196481886L, + 3614810992L, 1610021185L, 1785757066L, 851346168L, 3761148643L, 2918835642L, 3364422385L, 3012284466L, 3735958851L, 2643153892L, + 3778608231L, 1164289832L, 205853021L, 2876112231L, 3503398282L, 3078397001L, 3472037921L, 1748894853L, 2740861475L, 316056182L, + 1660426908L, 168885906L, 956005527L, 3984354789L, 566521563L, 1001109523L, 1216710575L, 2952284757L, 3834433081L, 3842608301L, + 2467352408L, 3974441264L, 3256601745L, 1409353924L, 1329904859L, 2307560293L, 3125217879L, 3622920184L, 3832785684L, 3882365951L, + 2308537115L, 2659155028L, 1450441945L, 3532257603L, 3186324194L, 1225603425L, 1124246549L, 175808705L, 3009142319L, 2796710159L, + 3651990107L, 160762750L, 1902254979L, 1698648476L, 1134980669L, 497144426L, 3302689335L, 4057485630L, 3603530763L, 4087252587L, + 427812652L, 286876201L, 823134128L, 1627554964L, 3745564327L, 2589226092L, 4202024494L, 62878473L, 3275585894L, 3987124064L, + 2791777159L, 1916869511L, 2585861905L, 1375038919L, 1403421920L, 60249114L, 3811870450L, 3021498009L, 2612993202L, 528933105L, + 2757361321L, 3341402964L, 2621861700L, 273128190L, 4015252178L, 3094781002L, 1621621288L, 2337611177L, 1796718448L, 1258965619L, + 4241913140L, 2138560392L, 3022190223L, 4174180924L, 450094611L, 3274724580L, 617150026L, 2704660665L, 1469700689L, 1341616587L, + 356715071L, 1188789960L, 2278869135L, 1766569160L, 2795896635L, 57824704L, 2893496380L, 1235723989L, 1630694347L, 3927960522L, + 428891364L, 1814070806L, 2287999787L, 4125941184L, 3968103889L, 3548724050L, 1025597707L, 1404281500L, 2002212197L, 92429143L, + 2313943944L, 2403086080L, 3006180634L, 3561981764L, 1671860914L, 1768520622L, 1803542985L, 844848113L, 3006139921L, 1410888995L, + 1157749833L, 2125704913L, 1789979528L, 1799263423L, 741157179L, 2405862309L, 767040434L, 2655241390L, 3663420179L, 2172009096L, + 2511931187L, 1680542666L, 231857466L, 1154981000L, 157168255L, 1454112128L, 3505872099L, 1929775046L, 2309422350L, 2143329496L, + 2960716902L, 407610648L, 2938108129L, 2581749599L, 538837155L, 2342628867L, 430543915L, 740188568L, 1937713272L, 3315215132L, + 2085587024L, 4030765687L, 766054429L, 3517641839L, 689721775L, 1294158986L, 1753287754L, 4202601348L, 1974852792L, 33459103L, + 3568087535L, 3144677435L, 1686130825L, 4134943013L, 3005738435L, 3599293386L, 426570142L, 754104406L, 3660892564L, 1964545167L, + 829466833L, 821587464L, 1746693036L, 1006492428L, 1595312919L, 1256599985L, 1024482560L, 1897312280L, 2902903201L, 691790057L, + 1037515867L, 3176831208L, 1968401055L, 2173506824L, 1089055278L, 1748401123L, 2941380082L, 968412354L, 1818753861L, 2973200866L, + 3875951774L, 1119354008L, 3988604139L, 1647155589L, 2232450826L, 3486058011L, 3655784043L, 3759258462L, 847163678L, 1082052057L, + 989516446L, 2871541755L, 3196311070L, 3929963078L, 658187585L, 3664944641L, 2175149170L, 2203709147L, 2756014689L, 2456473919L, + 3890267390L, 1293787864L, 2830347984L, 3059280931L, 4158802520L, 1561677400L, 2586570938L, 783570352L, 1355506163L, 31495586L, + 3789437343L, 3340549429L, 2092501630L, 896419368L, 671715824L, 3530450081L, 3603554138L, 1055991716L, 3442308219L, 1499434728L, + 3130288473L, 3639507000L, 17769680L, 2259741420L, 487032199L, 4227143402L, 3693771256L, 1880482820L, 3924810796L, 381462353L, + 4017855991L, 2452034943L, 2736680833L, 2209866385L, 2128986379L, 437874044L, 595759426L, 641721026L, 1636065708L, 3899136933L, + 629879088L, 3591174506L, 351984326L, 2638783544L, 2348444281L, 2341604660L, 2123933692L, 143443325L, 1525942256L, 364660499L, + 599149312L, 939093251L, 1523003209L, 106601097L, 376589484L, 1346282236L, 1297387043L, 764598052L, 3741218111L, 933457002L, + 1886424424L, 3219631016L, 525405256L, 3014235619L, 323149677L, 2038881721L, 4100129043L, 2851715101L, 2984028078L, 1888574695L, + 2014194741L, 3515193880L, 4180573530L, 3461824363L, 2641995497L, 3179230245L, 2902294983L, 2217320456L, 4040852155L, 1784656905L, + 3311906931L, 87498458L, 2752971818L, 2635474297L, 2831215366L, 3682231106L, 2920043893L, 3772929704L, 2816374944L, 309949752L, + 2383758854L, 154870719L, 385111597L, 1191604312L, 1840700563L, 872191186L, 2925548701L, 1310412747L, 2102066999L, 1504727249L, + 3574298750L, 1191230036L, 3330575266L, 3180292097L, 3539347721L, 681369118L, 3305125752L, 3648233597L, 950049240L, 4173257693L, + 1760124957L, 512151405L, 681175196L, 580563018L, 1169662867L, 4015033554L, 2687781101L, 699691603L, 2673494188L, 1137221356L, + 123599888L, 472658308L, 1053598179L, 1012713758L, 3481064843L, 3759461013L, 3981457956L, 3830587662L, 1877191791L, 3650996736L, + 988064871L, 3515461600L, 4089077232L, 2225147448L, 1249609188L, 2643151863L, 3896204135L, 2416995901L, 1397735321L, 3460025646L}; /** - * Compare results with - * http://www.math.keio.ac.jp/matumoto/CODES/MT2002/mt19937ar.out + * Compare results with http://www.math.keio.ac.jp/matumoto/CODES/MT2002/mt19937ar.out */ @Test public void testCorrectness() { 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 76f2bd9c2..0b6a13bed 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 @@ -22,13 +22,16 @@ public class DateTimeHelperTest { assertEquals("01h 00m 00s", DateTimeHelper.getDeltaBetweenTimestamps(0, 60 * 1000 * 60)); assertEquals("12h 34m 56s", DateTimeHelper.getDeltaBetweenTimestamps(0, 60 * 1000 * 60 * 12 + 60 * 1000 * 34 + 56 * 1000)); - assertEquals("1 Days 01h 00m 00s", DateTimeHelper.getDeltaBetweenTimestamps(0, 60 * 1000 * 60 * 25)); - assertEquals("1 Days 01h 20m 40s", DateTimeHelper.getDeltaBetweenTimestamps(0, 60 * 1000 * 60 * 24 + 60 * 1000 * 60 + 60 * 1000 * 20 + 40 * 1000)); + assertEquals("1 Days 01h 00m 00s", + DateTimeHelper.getDeltaBetweenTimestamps(0, 60 * 1000 * 60 * 25)); + assertEquals("1 Days 01h 20m 40s", + DateTimeHelper.getDeltaBetweenTimestamps(0, 60 * 1000 * 60 * 24 + 60 * 1000 * 60 + 60 * 1000 * 20 + 40 * 1000)); assertEquals("00h 00m 00s", DateTimeHelper.getDeltaBetweenTimestamps(1000, 1000)); assertEquals("00h 00m 00s", DateTimeHelper.getDeltaBetweenTimestamps(50000, 50000)); - assertEquals("11h 01m 01s", DateTimeHelper.getDeltaBetweenTimestamps(1000 * 60 * 25, 1000 * 60 * 25 + 60 * 1000 * 60 * 11 + 60 * 1000 + 1000)); + assertEquals("11h 01m 01s", + DateTimeHelper.getDeltaBetweenTimestamps(1000 * 60 * 25, 1000 * 60 * 25 + 60 * 1000 * 60 * 11 + 60 * 1000 + 1000)); } @Test 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 a31d706f7..f70131f6c 100644 --- a/engine/src/main/java/org/terasology/engine/audio/Sound.java +++ b/engine/src/main/java/org/terasology/engine/audio/Sound.java @@ -15,7 +15,8 @@ import org.terasology.gestalt.assets.ResourceUrn; public abstract class Sound extends Asset implements org.terasology.nui.asset.Sound { /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. + * It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. @@ -25,7 +26,8 @@ public abstract class Sound extends Asset implements org } /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. + * It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. 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 a6a8016e6..311e8141a 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StaticSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/StaticSound.java @@ -13,7 +13,8 @@ import org.terasology.gestalt.assets.ResourceUrn; public abstract class StaticSound extends Sound { /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. + * It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. @@ -23,7 +24,8 @@ public abstract class StaticSound extends Sound { } /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. + * It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. 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 2f4c6ef62..177f55a12 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java @@ -13,7 +13,8 @@ import org.terasology.gestalt.assets.ResourceUrn; public abstract class StreamingSound extends Sound { /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. + * It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. @@ -23,7 +24,8 @@ public abstract class StreamingSound extends Sound { } /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. + * It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. 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 1cac9a3f3..bd39880a6 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 @@ -2,7 +2,8 @@ // 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 + * 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 * framework. *

* To support this functionality, a copy-strategy library is used to provide copying support for types. This is used instead of cloning because 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 b9081a759..b378a5b88 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 @@ -276,12 +276,14 @@ public class OpenALManager implements AudioManager { @Override public AssetFactory getStaticSoundFactory() { - return (urn, assetType, data) -> new OpenALSound(urn, assetType, data, OpenALManager.this, new OpenALSound.DisposalAction(urn)); + return (urn, assetType, data) -> new OpenALSound(urn, assetType, data, + OpenALManager.this, new OpenALSound.DisposalAction(urn)); } @Override public AssetFactory getStreamingSoundFactory() { - return (urn, assetType, data) -> new OpenALStreamingSound(urn, assetType, data, OpenALManager.this, new OpenALStreamingSound.DisposalAction(urn)); + return (urn, assetType, data) -> new OpenALStreamingSound(urn, assetType, data, + OpenALManager.this, new OpenALStreamingSound.DisposalAction(urn)); } public void purgeSound(Sound sound) { 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 e0541c118..95e4164e0 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 @@ -35,7 +35,8 @@ public final class OpenALSound extends StaticSound { // TODO: Do we have proper support for unloading sounds (as mods are changed?) private int bufferId; - public OpenALSound(ResourceUrn urn, AssetType assetType, StaticSoundData data, OpenALManager audioManager, OpenALSound.DisposalAction disposalAction) { + public OpenALSound(ResourceUrn urn, AssetType assetType, StaticSoundData data, + OpenALManager audioManager, OpenALSound.DisposalAction disposalAction) { super(urn, assetType, disposalAction); disposalAction.setAsset(this); this.audioManager = audioManager; @@ -92,7 +93,8 @@ public final class OpenALSound extends StaticSound { audioManager.purgeSound(this); } - AL10.alBufferData(bufferId, newData.getChannels() == 1 ? AL10.AL_FORMAT_MONO16 : AL10.AL_FORMAT_STEREO16, newData.getData(), newData.getSampleRate()); + AL10.alBufferData(bufferId, newData.getChannels() == 1 ? AL10.AL_FORMAT_MONO16 : AL10.AL_FORMAT_STEREO16, + newData.getData(), newData.getSampleRate()); OpenALException.checkState("Allocating sound buffer"); int bits = newData.getBufferBits(); 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 2aa05ab60..47851744a 100644 --- a/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java @@ -23,8 +23,10 @@ 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"); + 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"); private PublicIdentityCertificate serverPublicCertificate; private PrivateIdentityCertificate serverPrivateCertificate; @@ -76,14 +78,17 @@ public class SecurityConfig { public static final String CLIENT_IDENTITIES = "clientIdentities"; @Override - public SecurityConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public SecurityConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { SecurityConfig result = new SecurityConfig(); JsonObject jsonObject = json.getAsJsonObject(); if (jsonObject.has(SERVER_PUBLIC_CERTIFICATE)) { - result.serverPublicCertificate = context.deserialize(jsonObject.getAsJsonObject(SERVER_PUBLIC_CERTIFICATE), PublicIdentityCertificate.class); + result.serverPublicCertificate = context.deserialize(jsonObject.getAsJsonObject(SERVER_PUBLIC_CERTIFICATE), + PublicIdentityCertificate.class); } if (jsonObject.has(SERVER_PRIVATE_CERTIFICATE)) { - result.serverPrivateCertificate = context.deserialize(jsonObject.getAsJsonObject(SERVER_PRIVATE_CERTIFICATE), PrivateIdentityCertificate.class); + result.serverPrivateCertificate = context.deserialize(jsonObject.getAsJsonObject(SERVER_PRIVATE_CERTIFICATE), + PrivateIdentityCertificate.class); } if (jsonObject.has(CLIENT_IDENTITIES)) { JsonArray clientArray = jsonObject.getAsJsonArray(CLIENT_IDENTITIES); 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 0382e1e81..c52c009b6 100644 --- a/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java @@ -16,7 +16,9 @@ public class TelemetryConfig { private boolean telemetryEnabled; - private String telemetryDestination = TelemetryEmitter.getDefaultCollectorURL(DEFAULT_COLLECTOR_PROTOCOL, DEFAULT_COLLECTOR_HOST, DEFAULT_COLLECTOR_PORT).toString(); + private String telemetryDestination = TelemetryEmitter + .getDefaultCollectorURL(DEFAULT_COLLECTOR_PROTOCOL, DEFAULT_COLLECTOR_HOST, DEFAULT_COLLECTOR_PORT) + .toString(); private String telemetryServerName = TelemetryEmitter.DEFAULT_COLLECTOR_NAME; @@ -24,7 +26,8 @@ public class TelemetryConfig { private boolean errorReportingEnabled; - private String errorReportingDestination = TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST + ":" + TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT; + private String errorReportingDestination = TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST + + ":" + TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT; private String errorReportingServerName = TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java b/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java index fb5aab581..829d48ec1 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java @@ -11,7 +11,8 @@ import java.util.Optional; /** * Creates {@link UIWidget}s by {@link Setting} and used {@link SettingConstraint} *

- * You should to implement {@link ConstraintWidgetFactory} if you what use custom type in your {@link org.terasology.engine.config.flexible.AutoConfig} + * You should to implement {@link ConstraintWidgetFactory} if you what use custom type + * in your {@link org.terasology.engine.config.flexible.AutoConfig} * * @param type of setting * @param concrete type of {@link SettingConstraint} diff --git a/engine/src/main/java/org/terasology/engine/core/EngineStatus.java b/engine/src/main/java/org/terasology/engine/core/EngineStatus.java index 9620e5449..f5608a2c6 100644 --- a/engine/src/main/java/org/terasology/engine/core/EngineStatus.java +++ b/engine/src/main/java/org/terasology/engine/core/EngineStatus.java @@ -3,8 +3,8 @@ package org.terasology.engine.core; /** - * Engine Status provides the current status of the engine - what it is doing, at a higher granularity than just running. This can be used by external and internal observers - * to report on the state of the engine, such as splash screens/loading screens. + * Engine Status provides the current status of the engine - what it is doing, at a higher granularity than just running. + * This can be used by external and internal observers to report on the state of the engine, such as splash screens/loading screens. */ public interface EngineStatus { 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 296e09b75..2d4cbcdc1 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 @@ -146,9 +146,13 @@ public final class EntitySystemSetupUtil { registerEvents(entityManager.getEventSystem(), environment); } - private static EventSystem createEventSystem(NetworkSystem networkSystem, PojoEntityManager entityManager, EntitySystemLibrary library, - RecordedEventStore recordedEventStore, RecordAndReplaySerializer recordAndReplaySerializer, - RecordAndReplayUtils recordAndReplayUtils, RecordAndReplayCurrentStatus recordAndReplayCurrentStatus) { + private static EventSystem createEventSystem(NetworkSystem networkSystem, + PojoEntityManager entityManager, + EntitySystemLibrary library, + RecordedEventStore recordedEventStore, + RecordAndReplaySerializer recordAndReplaySerializer, + RecordAndReplayUtils recordAndReplayUtils, + RecordAndReplayCurrentStatus recordAndReplayCurrentStatus) { EventSystem eventSystem; List> selectedClassesToRecord = createSelectedClassesToRecordList(); if (recordAndReplayCurrentStatus.getStatus() == RecordAndReplayStatus.PREPARING_REPLAY) { @@ -167,7 +171,8 @@ public final class EntitySystemSetupUtil { for (Class componentType : environment.getSubtypesOf(Component.class)) { if (componentType.getAnnotation(DoNotAutoRegister.class) == null) { String componentName = MetadataUtil.getComponentClassName(componentType); - Name componentModuleName = verifyNotNull(environment.getModuleProviding(componentType), "Could not find module for %s %s", componentName, componentType); + Name componentModuleName = verifyNotNull(environment.getModuleProviding(componentType), + "Could not find module for %s %s", componentName, componentType); library.register(new ResourceUrn(componentModuleName.toString(), componentName), componentType); } } diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/EnvironmentSwitchHandler.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/EnvironmentSwitchHandler.java index dcf3b7235..d24027b93 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/EnvironmentSwitchHandler.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/EnvironmentSwitchHandler.java @@ -184,7 +184,6 @@ public final class EnvironmentSwitchHandler { } } - @SuppressWarnings({"rawtypes", "unchecked"}) private static void registerTypeHandlers(Context context, TypeHandlerLibrary library, ModuleEnvironment environment) { for (Class handler : environment.getSubtypesOf(TypeHandler.class)) { 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 a180de6f2..21cf3d990 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 @@ -8,8 +8,9 @@ import org.terasology.gestalt.module.sandbox.API; /** * Event which is triggered when LocalPlayer is setup with a character entity. Allows for detection of when LocalPlayer is - * completely setup for a character, in case a system needs to wait until it is setup and therefore cannot act in {@link BaseComponentSystem#postBegin()} - * Event is sent to the character entity. This only triggers at the setup of the local player(once per in game session). It is sent by + * completely setup for a character, in case a system needs to wait until it is setup and therefore cannot act + * an {@link BaseComponentSystem#postBegin()} Event is sent to the character entity. + * This only triggers at the setup of the local player(once per in game session). It is sent by * {@link AwaitCharacterSpawn} * * API annotation is to allow modules to utilize this event as well. 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 151b3b61c..d4e1c4945 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 @@ -16,8 +16,9 @@ public interface EngineSubsystem { String getName(); /** - * Called on each system before initialisation. This is an opportunity to add anything into the root context that will carry across the entire rune - * of the engine, and may be used by other systems + * Called on each system before initialisation. + * This is an opportunity to add anything into the root context that will carry across the entire rune of the engine, + * and may be used by other systems * * @param rootContext The root context, that will survive the entire run of the engine */ 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 cc0283785..2df729c11 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 @@ -227,7 +227,9 @@ public class BindsSubsystem implements EngineSubsystem, BindsManager { bindButton.setMode(info.mode()); bindButton.setRepeating(info.repeating()); - bindsConfiguration.getBinds(bindUri).stream().filter(input -> input != null).forEach(input -> linkBindButtonToInput(input, bindUri)); + bindsConfiguration.getBinds(bindUri).stream() + .filter(input -> input != null) + .forEach(input -> linkBindButtonToInput(input, bindUri)); logger.debug("Registered button bind: {}", bindUri); } catch (InstantiationException | IllegalAccessException e) { @@ -257,7 +259,8 @@ public class BindsSubsystem implements EngineSubsystem, BindsManager { continue; } try { - BindableAxis bindAxis = registerBindAxis(id.toString(), (BindAxisEvent) registerBindClass.newInstance(), positiveButton, negativeButton); + BindableAxis bindAxis = registerBindAxis(id.toString(), (BindAxisEvent) registerBindClass.newInstance(), + positiveButton, negativeButton); bindAxis.setSendEventMode(info.eventMode()); logger.debug("Registered axis bind: {}", id); } catch (InstantiationException | IllegalAccessException e) { 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 fde0457ce..7d1e4c010 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 @@ -34,7 +34,8 @@ public class HeadlessCanvasRenderer implements TerasologyCanvasRenderer { } @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) { // Do nothing } @@ -64,18 +65,20 @@ public class HeadlessCanvasRenderer implements TerasologyCanvasRenderer { } @Override - public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, Rectanglei absoluteRegion, float ux, float uy, float uw, float uh, float alpha) { + public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, Rectanglei absoluteRegion, + float ux, float uy, float uw, float uh, float alpha) { // Do nothing } @Override - public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAlign vAlign, Rectanglei absoluteRegion, Colorc color, Colorc shadowColor, - float alpha, boolean underlined) { + public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAlign vAlign, Rectanglei absoluteRegion, + Colorc color, Colorc shadowColor, float alpha, boolean underlined) { // Do nothing } @Override - public void drawTextureBordered(UITextureRegion texture, Rectanglei absoluteRegion, Border border, boolean tile, float ux, float uy, float uw, float uh, float alpha) { + public void drawTextureBordered(UITextureRegion texture, Rectanglei absoluteRegion, Border border, boolean tile, + float ux, float uy, float uw, float uh, float alpha) { // Do nothing } diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessWorldRenderer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessWorldRenderer.java index e71c1e9ea..43a97ab95 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessWorldRenderer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessWorldRenderer.java @@ -29,7 +29,9 @@ import java.util.List; public class HeadlessWorldRenderer implements WorldRenderer { - private static final int MAX_CHUNKS = ViewDistance.MEGA.getChunkDistance().x() * ViewDistance.MEGA.getChunkDistance().y() * ViewDistance.MEGA.getChunkDistance().z(); + private static final int MAX_CHUNKS = ViewDistance.MEGA.getChunkDistance().x() + * ViewDistance.MEGA.getChunkDistance().y() + * ViewDistance.MEGA.getChunkDistance().z(); private WorldProvider worldProvider; private ChunkProvider chunkProvider; @@ -193,20 +195,22 @@ public class HeadlessWorldRenderer implements WorldRenderer { boolean chunksCurrentlyPending = false; if (!newChunkPos.equals(chunkPos) || force || pendingChunks) { Vector3ic viewingDistance = config.getRendering().getViewDistance().getChunkDistance(); - BlockRegion viewRegion = new BlockRegion(newChunkPos).expand(new org.joml.Vector3i(viewingDistance.x() / 2, viewingDistance.y() / 2, viewingDistance.z() / 2)); + BlockRegion viewRegion = new BlockRegion(newChunkPos) + .expand(new Vector3i(viewingDistance.x() / 2, viewingDistance.y() / 2, viewingDistance.z() / 2)); if (chunksInProximity.size() == 0 || force || pendingChunks) { // just add all visible chunks chunksInProximity.clear(); for (Vector3ic chunkPosition : viewRegion) { Chunk c = chunkProvider.getChunk(chunkPosition); - if (c != null && worldProvider.getLocalView(c.getPosition(new org.joml.Vector3i())) != null) { + if (c != null && worldProvider.getLocalView(c.getPosition(new Vector3i())) != null) { chunksInProximity.add(c); } else { chunksCurrentlyPending = true; } } } else { - BlockRegion oldRegion = new BlockRegion(chunkPos).expand(new org.joml.Vector3i(viewingDistance.x() / 2, viewingDistance.y() / 2, viewingDistance.z() / 2)); + BlockRegion oldRegion = new BlockRegion(chunkPos) + .expand(new Vector3i(viewingDistance.x() / 2, viewingDistance.y() / 2, viewingDistance.z() / 2)); // remove for (Vector3ic candidateForRemove : viewRegion) { @@ -222,7 +226,7 @@ public class HeadlessWorldRenderer implements WorldRenderer { // add for (Vector3ic chunkPosition : viewRegion) { Chunk c = chunkProvider.getChunk(chunkPosition); - if (c != null && worldProvider.getLocalView(c.getPosition(new org.joml.Vector3i())) != null) { + if (c != null && worldProvider.getLocalView(c.getPosition(new Vector3i())) != null) { chunksInProximity.add(c); } else { chunksCurrentlyPending = true; 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 9aeaa6be5..188bb9ba8 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 @@ -28,7 +28,8 @@ public interface EventSystem { void registerEvent(ResourceUrn uri, Class eventType); /** - * Registers an object as an event handler - all methods with the {@link org.terasology.engine.entitySystem.event.ReceiveEvent} annotation will be registered + * Registers an object as an event handler - all methods with the {@link org.terasology.engine.entitySystem.event.ReceiveEvent} + * annotation will be registered * * @param handler */ @@ -48,7 +49,8 @@ public interface EventSystem { * @param componentTypes * @param */ - void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, Class... componentTypes); + void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, + Class... componentTypes); /** * @param eventReceiver @@ -57,9 +59,11 @@ public interface EventSystem { * @param componentTypes * @param */ - void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, int priority, Class... componentTypes); + void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, + int priority, Class... componentTypes); - void unregisterEventReceiver(EventReceiver eventReceiver, Class eventClass, Class... componentTypes); + void unregisterEventReceiver(EventReceiver eventReceiver, Class eventClass, + Class... componentTypes); /** * Sends an event to all handlers for an entity's components 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 94d8c56db..e48807109 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 @@ -19,7 +19,8 @@ import java.util.Collection; import java.util.Map; /** - * Field Metadata for the fields of components. In addition to the standard and replication metadata, has information on whether the field declares ownership over an entity. + * Field Metadata for the fields of components. + * In addition to the standard and replication metadata, has information on whether the field declares ownership over an entity. * */ public class ComponentFieldMetadata extends ReplicatedFieldMetadata { @@ -28,14 +29,16 @@ public class ComponentFieldMetadata extends ReplicatedFi private final CopyStrategy copyWithOwnedEntitiesStrategy; - public ComponentFieldMetadata(ClassMetadata owner, Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory, boolean replicatedByDefault) + public ComponentFieldMetadata(ClassMetadata owner, Field field, CopyStrategyLibrary copyStrategyLibrary, + ReflectFactory factory, boolean replicatedByDefault) throws InaccessibleFieldException { super(owner, field, copyStrategyLibrary, factory, replicatedByDefault); 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; } 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 e8eaa601b..fe05abcaf 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 @@ -40,7 +40,8 @@ public class ComponentLibrary extends ModuleClassLibrary { } @Override - protected ClassMetadata createMetadata(Class type, ReflectFactory factory, CopyStrategyLibrary copyStrategies, ResourceUrn uri) { + protected ClassMetadata createMetadata(Class type, ReflectFactory factory, + CopyStrategyLibrary copyStrategies, ResourceUrn uri) { ComponentMetadata info; try { info = new ComponentMetadata<>(uri, type, factory, copyStrategies); 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 d41909352..8288fee14 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 @@ -42,7 +42,8 @@ public class ComponentMetadata extends ClassMetadata type, ReflectFactory factory, CopyStrategyLibrary copyStrategies) throws NoSuchMethodException { + public ComponentMetadata(ResourceUrn uri, Class type, ReflectFactory factory, CopyStrategyLibrary copyStrategies) + throws NoSuchMethodException { super(uri.toString(), type, factory, copyStrategies, Predicates.alwaysTrue()); persisted = type.getAnnotation(DoNotPersist.class) == null; replicated = type.getAnnotation(Replicate.class) != null; @@ -69,7 +70,8 @@ public class ComponentMetadata extends ClassMetadata createField(Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory) throws InaccessibleFieldException { + protected ComponentFieldMetadata createField(Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory) + throws InaccessibleFieldException { return new ComponentFieldMetadata<>(this, field, copyStrategyLibrary, factory, false); } 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 95dc4ccd8..d65a6d49b 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 @@ -25,7 +25,8 @@ public class EventLibrary extends ModuleClassLibrary { } @Override - protected ClassMetadata createMetadata(Class type, ReflectFactory factory, CopyStrategyLibrary copyStrategies, ResourceUrn uri) { + protected ClassMetadata createMetadata(Class type, ReflectFactory factory, + CopyStrategyLibrary copyStrategies, ResourceUrn uri) { try { return new EventMetadata<>(type, copyStrategies, factory, uri); } catch (NoSuchMethodException e) { 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 0b8590589..3395bd13d 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 @@ -25,7 +25,8 @@ public class EventMetadata extends ClassMetadata simpleClass, CopyStrategyLibrary copyStrategies, ReflectFactory factory, ResourceUrn uri) throws NoSuchMethodException { + public EventMetadata(Class simpleClass, CopyStrategyLibrary copyStrategies, ReflectFactory factory, ResourceUrn uri) + throws NoSuchMethodException { super(uri.toString(), simpleClass, factory, copyStrategies, Predicates.alwaysTrue()); if (simpleClass.getAnnotation(ServerEvent.class) != null) { networkEventType = NetworkEventType.SERVER; @@ -70,7 +71,8 @@ public class EventMetadata extends ClassMetadata createField(Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory) throws InaccessibleFieldException { + protected ReplicatedFieldMetadata createField(Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory) + throws InaccessibleFieldException { return new ReplicatedFieldMetadata<>(this, field, copyStrategyLibrary, factory, true); } } 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 cc6112501..e60f3cebc 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 @@ -21,7 +21,8 @@ public class ReplicatedFieldMetadata extends FieldMetadata { private boolean replicated; private Replicate replicationInfo; - public ReplicatedFieldMetadata(ClassMetadata owner, Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory, boolean replicatedByDefault) + public ReplicatedFieldMetadata(ClassMetadata owner, Field field, CopyStrategyLibrary copyStrategyLibrary, + ReflectFactory factory, boolean replicatedByDefault) throws InaccessibleFieldException { super(owner, field, copyStrategyLibrary, factory); this.replicated = replicatedByDefault; 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 623643000..0e4122f56 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 @@ -4,7 +4,8 @@ package org.terasology.engine.entitySystem.systems; public interface ComponentSystem { /** - * Called to initialise the system. This occurs after injection, but before other systems are necessarily initialised, so they should not be interacted with. + * Called to initialise the system. + * This occurs after injection, but before other systems are necessarily initialised, so they should not be interacted with. */ void initialise(); 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 2fe899f09..73be65b18 100644 --- a/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java +++ b/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java @@ -34,7 +34,8 @@ public class CertificateGenerator { keyFactory = KeyFactory.getInstance(IdentityConstants.CERTIFICATE_ALGORITHM); signer = Signature.getInstance(IdentityConstants.SIGNATURE_ALGORITHM); } catch (NoSuchAlgorithmException e) { - throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + "', required for identity management", e); + throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + + "', required for identity management", e); } } 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 b481710a4..9e0fbb2a8 100644 --- a/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java +++ b/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java @@ -50,7 +50,8 @@ public class ClientIdentity { } if (obj instanceof ClientIdentity) { ClientIdentity other = (ClientIdentity) obj; - return Objects.equals(playerPublicCertificate, other.playerPublicCertificate) && Objects.equals(playerPrivateCertificate, other.playerPrivateCertificate); + return Objects.equals(playerPublicCertificate, other.playerPublicCertificate) + && Objects.equals(playerPrivateCertificate, other.playerPrivateCertificate); } return false; } 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 19d423e14..23f906adb 100644 --- a/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java +++ b/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java @@ -77,7 +77,8 @@ public class PrivateIdentityCertificate { cipher.init(Cipher.DECRYPT_MODE, key); return cipher.doFinal(data); } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { - throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + "', required for identity management", e); + throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + + "', required for identity management", e); } catch (InvalidKeySpecException | InvalidKeyException e) { throw new RuntimeException("Unexpected error during encryption", e); } catch (BadPaddingException | IllegalBlockSizeException e) { 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 13c0913eb..4bae86c47 100644 --- a/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java +++ b/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java @@ -108,7 +108,8 @@ public class PublicIdentityCertificate { cipher.init(Cipher.ENCRYPT_MODE, key); return cipher.doFinal(data); } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { - throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + "', required for identity management", e); + throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + + "', required for identity management", e); } catch (InvalidKeySpecException | InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) { throw new RuntimeException("Unexpected error during encryption", e); } @@ -141,7 +142,8 @@ public class PublicIdentityCertificate { signatureVerifier.update(exponent.toByteArray()); return signatureVerifier.verify(getSignatureBytes()); } catch (NoSuchAlgorithmException e) { - throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + "', required for identity management", e); + throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + + "', required for identity management", e); } catch (InvalidKeySpecException e) { return false; } catch (SignatureException e) { @@ -169,7 +171,8 @@ public class PublicIdentityCertificate { signatureVerifier.update(data); return signatureVerifier.verify(signedData); } catch (NoSuchAlgorithmException e) { - throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + "', required for identity management", e); + throw new RuntimeException("Insufficient support for '" + IdentityConstants.CERTIFICATE_ALGORITHM + + "', required for identity management", e); } catch (InvalidKeySpecException e) { return false; } catch (SignatureException e) { 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 a5b41b716..1f2ba4873 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 @@ -29,7 +29,8 @@ final class APISession { static APISession createFromLogin(URL hostURL, String login, String password) throws IOException, StorageServiceException { SessionPostRequestData req = new SessionPostRequestData(login, password); - SessionPostResponseData res = ServiceApiRequest.request(new URL(hostURL, ENDPOINT_SESSION), HttpMethod.POST, null, req, SessionPostResponseData.class); + SessionPostResponseData res = ServiceApiRequest.request(new URL(hostURL, ENDPOINT_SESSION), HttpMethod.POST, + null, req, SessionPostResponseData.class); return new APISession(hostURL, res.token); } @@ -52,7 +53,8 @@ final class APISession { } Map getAllIdentities() throws IOException, StorageServiceException { - AllIdentitiesGetResponseData res = requestEndpoint(ENDPOINT_CLIENT_IDENTITY, null, HttpMethod.GET, null, AllIdentitiesGetResponseData.class); + AllIdentitiesGetResponseData res = requestEndpoint(ENDPOINT_CLIENT_IDENTITY, null, HttpMethod.GET, + null, AllIdentitiesGetResponseData.class); return IdentityBundle.listToMap(res.clientIdentities); } 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 e2a3ed4ba..4859c3367 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 @@ -21,7 +21,8 @@ import java.net.URLDecoder; */ final class ServiceApiRequest { - private static final Gson GSON = new GsonBuilder().registerTypeHierarchyAdapter(BigInteger.class, BigIntegerBase64Serializer.getInstance()).create(); + private static final Gson GSON = + new GsonBuilder().registerTypeHierarchyAdapter(BigInteger.class, BigIntegerBase64Serializer.getInstance()).create(); private ServiceApiRequest() { } @@ -44,7 +45,8 @@ final class ServiceApiRequest { } } - public static RESPONSE request(HttpURLConnection firstConn, HttpMethod method, String sessionToken, REQUEST data, Class responseClass) + public static RESPONSE request(HttpURLConnection firstConn, HttpMethod method, String sessionToken, + REQUEST data, Class responseClass) throws IOException, StorageServiceException { HttpURLConnection conn = null; int followedRedirects = 0; @@ -62,7 +64,8 @@ final class ServiceApiRequest { //needed if the Location header specifies a relative redirect, e.g. "Location: /some/path/on/the/same/server" URL baseUrl = conn.getURL(); - //if redirectUrl is already absolute (contains authority), baseUrl will be ignored (see javadoc for the URL(URL, String) constructor for more info) + //if redirectUrl is already absolute (contains authority), baseUrl will be ignored + // (see javadoc for the URL(URL, String) constructor for more info) URL target = new URL(baseUrl, redirectUrl); conn = (HttpURLConnection) target.openConnection(); @@ -95,7 +98,8 @@ final class ServiceApiRequest { } } - public static RESPONSE request(URL url, HttpMethod method, String sessionToken, REQUEST data, Class responseClass) + public static RESPONSE request(URL url, HttpMethod method, String sessionToken, + REQUEST data, Class responseClass) throws IOException, StorageServiceException { return request((HttpURLConnection) url.openConnection(), method, sessionToken, data, responseClass); } 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 7c8e652ff..b1b4fcd0d 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,6 +7,7 @@ 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) +@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/cameraTarget/PlayerTargetSystem.java b/engine/src/main/java/org/terasology/engine/input/cameraTarget/PlayerTargetSystem.java index 97ea0d4dc..5fa7fde3f 100644 --- a/engine/src/main/java/org/terasology/engine/input/cameraTarget/PlayerTargetSystem.java +++ b/engine/src/main/java/org/terasology/engine/input/cameraTarget/PlayerTargetSystem.java @@ -63,7 +63,8 @@ public class PlayerTargetSystem extends BaseComponentSystem implements UpdateSub if (charComp != null) { Vector3f dir = player.getViewDirection(new Vector3f()); float maxDist = charComp.interactionRange; - FirstPersonHeldItemMountPointComponent heldItemMountPoint = player.getCameraEntity().getComponent(FirstPersonHeldItemMountPointComponent.class); + FirstPersonHeldItemMountPointComponent heldItemMountPoint = + player.getCameraEntity().getComponent(FirstPersonHeldItemMountPointComponent.class); if (heldItemMountPoint != null && heldItemMountPoint.isTracked()) { maxDist = heldItemMountPoint.translate.length() + 0.25f; dir = new Vector3f(heldItemMountPoint.translate).normalize(); 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 9fc8af344..f05f35393 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 @@ -37,7 +37,8 @@ public class SimpleAISystem extends BaseComponentSystem implements UpdateSubscri @Override public void update(float delta) { - for (EntityRef entity : entityManager.getEntitiesWith(SimpleAIComponent.class, CharacterMovementComponent.class, LocationComponent.class)) { + for (EntityRef entity : entityManager.getEntitiesWith(SimpleAIComponent.class, + CharacterMovementComponent.class, LocationComponent.class)) { LocationComponent location = entity.getComponent(LocationComponent.class); Vector3f worldPos = location.getWorldPosition(new Vector3f()); @@ -61,7 +62,8 @@ public class SimpleAISystem extends BaseComponentSystem implements UpdateSubscri } else { // Random walk if (time.getGameTimeInMs() - ai.lastChangeOfDirectionAt > 12000 || ai.followingPlayer) { - ai.movementTarget.set(worldPos.x + random.nextFloat(-500.0f, 500.0f), worldPos.y, worldPos.z + random.nextFloat(-500.0f, 500.0f)); + ai.movementTarget.set(worldPos.x + random.nextFloat(-500.0f, 500.0f), worldPos.y, + worldPos.z + random.nextFloat(-500.0f, 500.0f)); ai.lastChangeOfDirectionAt = time.getGameTimeInMs(); ai.followingPlayer = false; entity.saveComponent(ai); @@ -77,7 +79,8 @@ public class SimpleAISystem extends BaseComponentSystem implements UpdateSubscri location.setLocalRotation(new Quaternionf().setAngleAxis(yaw, 0, 1, 0)); entity.saveComponent(location); } - entity.send(new CharacterMoveInputEvent(0, 0, 0, drive, false, false, false, time.getGameDeltaInMs())); + entity.send(new CharacterMoveInputEvent(0, 0, 0, drive, + false, false, false, time.getGameDeltaInMs())); } } diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorSystem.java b/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorSystem.java index 02b79673f..d71cde4b1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorSystem.java @@ -100,7 +100,8 @@ public class BehaviorSystem extends BaseComponentSystem implements UpdateSubscri public BehaviorTree createTree(String name, BehaviorNode root) { BehaviorTreeData data = new BehaviorTreeData(); data.setRoot(root); - BehaviorTree behaviorTree = assetManager.loadAsset(new ResourceUrn(BEHAVIORS, new Name(name.replaceAll("\\W+", ""))), data, BehaviorTree.class); + BehaviorTree behaviorTree = assetManager.loadAsset( + new ResourceUrn(BEHAVIORS, new Name(name.replaceAll("\\W+", ""))), data, BehaviorTree.class); trees.add(behaviorTree); save(behaviorTree); return behaviorTree; diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorSystem.java b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorSystem.java index d2d9b3d42..5e7b0f8b5 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorSystem.java @@ -101,7 +101,8 @@ public class CollectiveBehaviorSystem extends BaseComponentSystem implements Upd public BehaviorTree createTree(String name, BehaviorNode root) { BehaviorTreeData data = new BehaviorTreeData(); data.setRoot(root); - BehaviorTree behaviorTree = assetManager.loadAsset(new ResourceUrn(BEHAVIORS, new Name(name.replaceAll("\\W+", ""))), data, BehaviorTree.class); + BehaviorTree behaviorTree = assetManager.loadAsset(new ResourceUrn(BEHAVIORS, new Name(name.replaceAll("\\W+", ""))), + data, BehaviorTree.class); trees.add(behaviorTree); save(behaviorTree); return behaviorTree; diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/conditions/ConditionAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/conditions/ConditionAction.java index dc6483d38..9ba2ff516 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/conditions/ConditionAction.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/conditions/ConditionAction.java @@ -55,11 +55,14 @@ public class ConditionAction extends BaseAction { } return BehaviorState.SUCCESS; } catch (ClassNotFoundException e) { - logger.error("Class not found. Does the Component specified exist?", e); + logger.error("Class not found. " + + "Does the Component specified exist?", e); } catch (NoSuchFieldException e) { - logger.error("Field not found. Does the field specified in 'values' (publicly) exist in the Component specified in 'componentPresent'?", e); + logger.error("Field not found. " + + "Does the field specified in 'values' (publicly) exist in the Component specified in 'componentPresent'?", e); } catch (IllegalAccessException e) { - logger.error("Illegal access. Do we have access to the Component in question?", e); + logger.error("Illegal access. " + + "Do we have access to the Component in question?", e); } return BehaviorState.FAILURE; } diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java index 670276613..cc47b90d8 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java @@ -18,7 +18,8 @@ public class BehaviorTree extends Asset { private BehaviorTreeData data; /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, + * and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditor.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditor.java index 14edde29d..a470f194a 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditor.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditor.java @@ -285,7 +285,8 @@ public class BehaviorEditor extends ZoomableLayout implements DefaultBehaviorTre public void layout(RenderableNode start) { LayoutTree layoutTree = new LayoutTree(start); - TreeLayout layout = new TreeLayout<>(layoutTree, new FixedNodeExtentProvider(10, 5), new DefaultConfiguration(4, 2)); + TreeLayout layout = new TreeLayout<>(layoutTree, new FixedNodeExtentProvider(10, 5), + new DefaultConfiguration(4, 2)); Map bounds = layout.getNodeBounds(); for (Map.Entry entry : bounds.entrySet()) { RenderableNode node = entry.getKey(); diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/RenderableNode.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/RenderableNode.java index 4074a21cf..f1e735797 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/RenderableNode.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/RenderableNode.java @@ -61,7 +61,9 @@ public class RenderableNode extends CoreWidget implements ZoomableLayout.Positio MouseInput button = event.getMouseButton(); KeyboardDevice keyboard = event.getKeyboard(); dragged = false; - copyMode = button == MouseInput.MOUSE_LEFT && (keyboard.isKeyDown(Keyboard.KeyId.LEFT_SHIFT) || keyboard.isKeyDown(Keyboard.KeyId.RIGHT_SHIFT)); + copyMode = button == MouseInput.MOUSE_LEFT + && (keyboard.isKeyDown(Keyboard.KeyId.LEFT_SHIFT) + || keyboard.isKeyDown(Keyboard.KeyId.RIGHT_SHIFT)); if (copyMode) { editor.copyNode(RenderableNode.this); } 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 03433649e..19f75bfcc 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 @@ -24,11 +24,13 @@ public class CharacterMoveInputEvent extends NetworkEvent { } @Deprecated - public CharacterMoveInputEvent(int sequence, float pitch, float yaw, Vector3fc movementDirection, boolean running, boolean jumping, long delta) { + public CharacterMoveInputEvent(int sequence, float pitch, float yaw, Vector3fc movementDirection, + boolean running, boolean jumping, long delta) { this(sequence, pitch, yaw, movementDirection, running, false, jumping, delta); } - public CharacterMoveInputEvent(int sequence, float pitch, float yaw, Vector3fc movementDirection, boolean running, boolean crouching, boolean jumping, long delta) { + public CharacterMoveInputEvent(int sequence, float pitch, float yaw, Vector3fc movementDirection, + boolean running, boolean crouching, boolean jumping, long delta) { this.delta = delta; this.pitch = pitch; this.yaw = yaw; 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 b4ca54985..f65c33250 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 @@ -56,7 +56,8 @@ import java.util.Optional; @RegisterSystem public class CharacterSystem extends BaseComponentSystem implements UpdateSubscriberSystem { - public static final CollisionGroup[] DEFAULTPHYSICSFILTER = {StandardCollisionGroup.DEFAULT, StandardCollisionGroup.WORLD, StandardCollisionGroup.CHARACTER}; + public static final CollisionGroup[] DEFAULTPHYSICSFILTER = + {StandardCollisionGroup.DEFAULT, StandardCollisionGroup.WORLD, StandardCollisionGroup.CHARACTER}; private static final Logger logger = LoggerFactory.getLogger(CharacterSystem.class); @In @@ -87,7 +88,8 @@ public class CharacterSystem extends BaseComponentSystem implements UpdateSubscr private RecordAndReplayCurrentStatus recordAndReplayCurrentStatus; @ReceiveEvent - public void beforeDestroy(BeforeDestroyEvent event, EntityRef character, CharacterComponent characterComponent, AliveCharacterComponent aliveCharacterComponent) { + public void beforeDestroy(BeforeDestroyEvent event, EntityRef character, + CharacterComponent characterComponent, AliveCharacterComponent aliveCharacterComponent) { if (character.hasComponent(PlayerCharacterComponent.class)) { // Consume the BeforeDestroyEvent so that the DoDestroy event is never sent for player entities event.consume(); @@ -350,7 +352,8 @@ public class CharacterSystem extends BaseComponentSystem implements UpdateSubscr return false; // can happen if target existed on client } - HitResult result = physics.rayTrace(originPos, direction, characterComponent.interactionRange, Sets.newHashSet(character), DEFAULTPHYSICSFILTER); + HitResult result = physics.rayTrace(originPos, direction, characterComponent.interactionRange, Sets.newHashSet(character), + DEFAULTPHYSICSFILTER); if (!result.isHit()) { String msg = "Denied activation attempt by {} since at the authority there was nothing to activate at that place"; logger.info(msg, getPlayerNameFromCharacter(character)); diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commands/ClientCommands.java b/engine/src/main/java/org/terasology/engine/logic/console/commands/ClientCommands.java index 4aec785ba..9a1cf0dc1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commands/ClientCommands.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commands/ClientCommands.java @@ -81,14 +81,19 @@ public class ClientCommands extends BaseComponentSystem { * Sets the spawn location for the client to the current location * @return String containing debug information on the entity */ - @Command(shortDescription = "Sets the spawn location for the client to the current location", runOnServer = true, requiredPermission = PermissionManager.CHEAT_PERMISSION) + @Command(shortDescription = "Sets the spawn location for the client to the current location", + runOnServer = true, requiredPermission = PermissionManager.CHEAT_PERMISSION) public String setSpawnLocation(@Sender EntityRef sender) { EntityRef clientInfo = sender.getComponent(ClientComponent.class).clientInfo; StaticSpawnLocationComponent staticSpawnLocationComponent = new StaticSpawnLocationComponent(); if (clientInfo.hasComponent(StaticSpawnLocationComponent.class)) { staticSpawnLocationComponent = clientInfo.getComponent(StaticSpawnLocationComponent.class); } - staticSpawnLocationComponent.position = sender.getComponent(ClientComponent.class).character.getComponent(LocationComponent.class).getWorldPosition(new Vector3f()); + staticSpawnLocationComponent.position = sender + .getComponent(ClientComponent.class) + .character + .getComponent(LocationComponent.class) + .getWorldPosition(new Vector3f()); clientInfo.addOrSaveComponent(staticSpawnLocationComponent); return "Set spawn location to- " + staticSpawnLocationComponent.position; } diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commands/CoreCommands.java b/engine/src/main/java/org/terasology/engine/logic/console/commands/CoreCommands.java index f6247b309..d41851df0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commands/CoreCommands.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commands/CoreCommands.java @@ -510,7 +510,8 @@ public class CoreCommands extends BaseComponentSystem { * @param prefabName String containing prefab name * @return String containing final message */ - @Command(shortDescription = "Spawns an instance of a prefab in the world", runOnServer = true, requiredPermission = PermissionManager.CHEAT_PERMISSION) + @Command(shortDescription = "Spawns an instance of a prefab in the world", runOnServer = true, + requiredPermission = PermissionManager.CHEAT_PERMISSION) public String spawnPrefab(@Sender EntityRef sender, @CommandParam("prefabId") String prefabName) { ClientComponent clientComponent = sender.getComponent(ClientComponent.class); LocationComponent characterLocation = clientComponent.character.getComponent(LocationComponent.class); @@ -547,7 +548,8 @@ public class CoreCommands extends BaseComponentSystem { * @return String containg final message */ @Command(shortDescription = "Spawns a block in front of the player", helpText = "Spawns the specified block as a " + - "item in front of the player. You can simply pick it up.", runOnServer = true, requiredPermission = PermissionManager.CHEAT_PERMISSION) + "item in front of the player. You can simply pick it up.", runOnServer = true, + requiredPermission = PermissionManager.CHEAT_PERMISSION) public String spawnBlock(@Sender EntityRef sender, @CommandParam("blockName") String blockName) { ClientComponent clientComponent = sender.getComponent(ClientComponent.class); LocationComponent characterLocation = clientComponent.character.getComponent(LocationComponent.class); @@ -706,27 +708,27 @@ public class CoreCommands extends BaseComponentSystem { } else { StringBuilder msg = new StringBuilder(); - msg.append("====================================================================================================================="); + msg.append("==========================================================================================================="); msg.append(Console.NEW_LINE); msg.append(cmd.getUsage()); msg.append(Console.NEW_LINE); - msg.append("====================================================================================================================="); + msg.append("==========================================================================================================="); msg.append(Console.NEW_LINE); if (!cmd.getHelpText().isEmpty()) { msg.append(cmd.getHelpText()); msg.append(Console.NEW_LINE); - msg.append("====================================================================================================================="); + msg.append("==========================================================================================================="); msg.append(Console.NEW_LINE); } else if (!cmd.getDescription().isEmpty()) { msg.append(cmd.getDescription()); msg.append(Console.NEW_LINE); - msg.append("====================================================================================================================="); + msg.append("==========================================================================================================="); msg.append(Console.NEW_LINE); } if (!cmd.getRequiredPermission().isEmpty()) { msg.append("Required permission level - " + cmd.getRequiredPermission()); msg.append(Console.NEW_LINE); - msg.append("====================================================================================================================="); + msg.append("==========================================================================================================="); msg.append(Console.NEW_LINE); } diff --git a/engine/src/main/java/org/terasology/engine/logic/debug/MovementDebugCommands.java b/engine/src/main/java/org/terasology/engine/logic/debug/MovementDebugCommands.java index a64c4c112..8c496c5a3 100644 --- a/engine/src/main/java/org/terasology/engine/logic/debug/MovementDebugCommands.java +++ b/engine/src/main/java/org/terasology/engine/logic/debug/MovementDebugCommands.java @@ -283,7 +283,8 @@ public class MovementDebugCommands extends BaseComponentSystem { @Command(value = "teleport", shortDescription = "Teleports you to a location", runOnServer = true, requiredPermission = PermissionManager.CHEAT_PERMISSION) - public String teleportCommand(@Sender EntityRef sender, @CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { + public String teleportCommand(@Sender EntityRef sender, + @CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { ClientComponent clientComp = sender.getComponent(ClientComponent.class); clientComp.character.send(new CharacterTeleportEvent(new Vector3f(x, y, z))); return "Teleporting to " + x + " " + y + " " + z; @@ -443,7 +444,9 @@ public class MovementDebugCommands extends BaseComponentSystem { clientComp.character.send(new CharacterTeleportEvent(vPlayerLocation)); CharacterMovementComponent characterMovementComponent = clientComp.character.getComponent(CharacterMovementComponent.class); - if (characterMovementComponent != null && playerMovementMode != MovementMode.NONE && playerMovementMode != characterMovementComponent.mode) { + if (characterMovementComponent != null + && playerMovementMode != MovementMode.NONE + && playerMovementMode != characterMovementComponent.mode) { clientComp.character.send(new SetMovementModeEvent(playerMovementMode)); } } diff --git a/engine/src/main/java/org/terasology/engine/logic/players/CameraClientSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/CameraClientSystem.java index 0a9ef0a7a..babdacd1d 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/CameraClientSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/CameraClientSystem.java @@ -97,14 +97,16 @@ public class CameraClientSystem extends BaseComponentSystem { } @ReceiveEvent - public void mountCameraOnActivate(OnActivatedComponent event, EntityRef entityRef, AutoMountCameraComponent autoMountCameraComponent, ClientComponent clientComponent) { + public void mountCameraOnActivate(OnActivatedComponent event, EntityRef entityRef, + AutoMountCameraComponent autoMountCameraComponent, ClientComponent clientComponent) { if (localPlayer.getClientEntity().equals(entityRef) && clientComponent.camera.exists()) { mountCamera(); } } @ReceiveEvent - public void mountCameraOnChange(OnChangedComponent event, EntityRef entityRef, AutoMountCameraComponent autoMountCameraComponent, ClientComponent clientComponent) { + public void mountCameraOnChange(OnChangedComponent event, EntityRef entityRef, + AutoMountCameraComponent autoMountCameraComponent, ClientComponent clientComponent) { if (localPlayer.getClientEntity().equals(entityRef) && clientComponent.camera.exists()) { mountCamera(); } 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 6e22113e3..cfc67fad2 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,7 +9,8 @@ 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") +@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/FirstPersonClientSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/FirstPersonClientSystem.java index c9c13531c..3469dbc1d 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/FirstPersonClientSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/FirstPersonClientSystem.java @@ -91,7 +91,9 @@ public class FirstPersonClientSystem extends BaseComponentSystem implements Upda @Command(shortDescription = "Sets the held item mount point translation for the first person view") public void setFirstPersonheldItemMountPointTranslation(@CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { - FirstPersonHeldItemMountPointComponent newComponent = localPlayer.getCameraEntity().getComponent(FirstPersonHeldItemMountPointComponent.class); + FirstPersonHeldItemMountPointComponent newComponent = localPlayer + .getCameraEntity() + .getComponent(FirstPersonHeldItemMountPointComponent.class); if (newComponent != null) { newComponent.translate = new Vector3f(x, y, z); ensureClientSideEntityOnHeldItemMountPoint(OnActivatedComponent.newInstance(), localPlayer.getCameraEntity(), newComponent); @@ -100,7 +102,9 @@ public class FirstPersonClientSystem extends BaseComponentSystem implements Upda @Command(shortDescription = "Sets the held item mount point rotation for the first person view") public void setFirstPersonheldItemMountPointRotation(@CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { - FirstPersonHeldItemMountPointComponent newComponent = localPlayer.getCameraEntity().getComponent(FirstPersonHeldItemMountPointComponent.class); + FirstPersonHeldItemMountPointComponent newComponent = localPlayer + .getCameraEntity() + .getComponent(FirstPersonHeldItemMountPointComponent.class); if (newComponent != null) { newComponent.rotateDegrees = new Vector3f(x, y, z); ensureClientSideEntityOnHeldItemMountPoint(OnActivatedComponent.newInstance(), localPlayer.getCameraEntity(), newComponent); @@ -108,7 +112,8 @@ public class FirstPersonClientSystem extends BaseComponentSystem implements Upda } @ReceiveEvent - public void onHeldItemActivated(OnActivatedComponent event, EntityRef character, CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { + public void onHeldItemActivated(OnActivatedComponent event, EntityRef character, + CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { if (localPlayer.getCharacterEntity().equals(character)) { EntityRef newItem = heldItemComponent.selectedItem; linkHeldItemLocationForLocalPlayer(newItem); @@ -116,7 +121,8 @@ public class FirstPersonClientSystem extends BaseComponentSystem implements Upda } @ReceiveEvent - public void onHeldItemChanged(OnChangedComponent event, EntityRef character, CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { + public void onHeldItemChanged(OnChangedComponent event, EntityRef character, + CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { if (localPlayer.getCharacterEntity().equals(character)) { EntityRef newItem = heldItemComponent.selectedItem; linkHeldItemLocationForLocalPlayer(newItem); @@ -162,7 +168,8 @@ public class FirstPersonClientSystem extends BaseComponentSystem implements Upda currentHeldItem.addComponent(new LocationComponent()); currentHeldItem.addComponent(new ItemIsHeldComponent()); - FirstPersonHeldItemTransformComponent heldItemTransformComponent = currentHeldItem.getComponent(FirstPersonHeldItemTransformComponent.class); + FirstPersonHeldItemTransformComponent heldItemTransformComponent = + currentHeldItem.getComponent(FirstPersonHeldItemTransformComponent.class); if (heldItemTransformComponent == null) { heldItemTransformComponent = new FirstPersonHeldItemTransformComponent(); currentHeldItem.addComponent(heldItemTransformComponent); @@ -198,8 +205,12 @@ public class FirstPersonClientSystem extends BaseComponentSystem implements Upda } // get the first person mount point and rotate it away from the camera - CharacterHeldItemComponent characterHeldItemComponent = localPlayer.getCharacterEntity().getComponent(CharacterHeldItemComponent.class); - FirstPersonHeldItemMountPointComponent mountPointComponent = localPlayer.getCameraEntity().getComponent(FirstPersonHeldItemMountPointComponent.class); + CharacterHeldItemComponent characterHeldItemComponent = localPlayer + .getCharacterEntity() + .getComponent(CharacterHeldItemComponent.class); + FirstPersonHeldItemMountPointComponent mountPointComponent = localPlayer + .getCameraEntity() + .getComponent(FirstPersonHeldItemMountPointComponent.class); if (characterHeldItemComponent == null || mountPointComponent == null) { return; 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 a8f397eda..54493ad6d 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,7 +9,8 @@ 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") +@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/LocalPlayer.java b/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayer.java index 7a6aaf083..975be0d4b 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayer.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayer.java @@ -5,8 +5,6 @@ package org.terasology.engine.logic.players; import com.google.common.collect.Sets; import org.joml.Quaternionf; import org.joml.Vector3f; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.logic.characters.CharacterComponent; import org.terasology.engine.logic.characters.CharacterMovementComponent; @@ -87,7 +85,9 @@ public class LocalPlayer { public boolean isValid() { EntityRef characterEntity = getCharacterEntity(); - return characterEntity.exists() && characterEntity.hasComponent(LocationComponent.class) && characterEntity.hasComponent(CharacterComponent.class) + return characterEntity.exists() + && characterEntity.hasComponent(LocationComponent.class) + && characterEntity.hasComponent(CharacterComponent.class) && characterEntity.hasComponent(CharacterMovementComponent.class); } diff --git a/engine/src/main/java/org/terasology/engine/logic/time/TimeAuthoritySystem.java b/engine/src/main/java/org/terasology/engine/logic/time/TimeAuthoritySystem.java index 5107104ca..184b779cc 100644 --- a/engine/src/main/java/org/terasology/engine/logic/time/TimeAuthoritySystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/time/TimeAuthoritySystem.java @@ -54,7 +54,8 @@ public class TimeAuthoritySystem extends BaseComponentSystem implements UpdateSu } } - @Command(shortDescription = "Toggle automatic time dilation", requiredPermission = PermissionManager.SERVER_MANAGEMENT_PERMISSION, runOnServer = true) + @Command(shortDescription = "Toggle automatic time dilation", requiredPermission = + PermissionManager.SERVER_MANAGEMENT_PERMISSION, runOnServer = true) public String toggleAutoTimeDilation() { enableAutomaticTimeDilation = !enableAutomaticTimeDilation; if (enableAutomaticTimeDilation) { 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 53433cf90..1c8d70f89 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 @@ -113,8 +113,12 @@ public class PerformanceMonitorImpl implements PerformanceMonitorInternal { if (!activityStack.isEmpty()) { ActivityInfo currentActivity = activityStack.peek(); - currentActivity.ownTime += newActivity.startTime - ((currentActivity.resumeTime > 0) ? currentActivity.resumeTime : currentActivity.startTime); - currentActivity.ownMem += (currentActivity.startMem - newActivity.startMem > 0) ? currentActivity.startMem - newActivity.startMem : 0; + currentActivity.ownTime += newActivity.startTime - ((currentActivity.resumeTime > 0) + ? currentActivity.resumeTime + : currentActivity.startTime); + currentActivity.ownMem += (currentActivity.startMem - newActivity.startMem > 0) + ? currentActivity.startMem - newActivity.startMem + : 0; } activityStack.push(newActivity); @@ -130,11 +134,15 @@ public class PerformanceMonitorImpl implements PerformanceMonitorInternal { ActivityInfo oldActivity = activityStack.pop(); long endTime = timer.getRealTimeInMs(); - long totalTime = (oldActivity.resumeTime > 0) ? oldActivity.ownTime + endTime - oldActivity.resumeTime : endTime - oldActivity.startTime; + long totalTime = (oldActivity.resumeTime > 0) + ? oldActivity.ownTime + endTime - oldActivity.resumeTime + : endTime - oldActivity.startTime; currentExecutionData.adjustOrPutValue(oldActivity.name, totalTime, totalTime); long endMem = Runtime.getRuntime().freeMemory(); - long totalMem = (oldActivity.startMem - endMem > 0) ? oldActivity.startMem - endMem + oldActivity.ownMem : oldActivity.ownMem; + long totalMem = (oldActivity.startMem - endMem > 0) + ? oldActivity.startMem - endMem + oldActivity.ownMem + : oldActivity.ownMem; currentAllocationData.adjustOrPutValue(oldActivity.name, totalMem, totalMem); if (!activityStack.isEmpty()) { diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ClientConnectionHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ClientConnectionHandler.java index 2874da97d..302abdc95 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ClientConnectionHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ClientConnectionHandler.java @@ -125,7 +125,8 @@ public class ClientConnectionHandler extends ChannelInboundHandlerAdapter { } /** - * Attempts to receive a module from the server and push it to the client. Creates a file on the target machine and begins preparation to write to it. + * Attempts to receive a module from the server and push it to the client. + * Creates a file on the target machine and begins preparation to write to it. * @param channelHandlerContext * @param moduleDataHeader */ 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 c2b234a79..a8bb84973 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 @@ -75,7 +75,8 @@ public class ClientHandshakeHandler extends ChannelInboundHandlerAdapter { } /** - * Process the handshake verification, checking that both the server and client have attempted it. If successful marks the channel as Authenticated. + * Process the handshake verification, checking that both the server and client have attempted it. + * If successful marks the channel as Authenticated. * @param handshakeVerification * @param ctx Channel Handler Context. */ @@ -88,7 +89,8 @@ public class ClientHandshakeHandler extends ChannelInboundHandlerAdapter { return; } - if (!serverCertificate.verify(HandshakeCommon.getSignatureData(serverHello, clientHello), handshakeVerification.getSignature().toByteArray())) { + if (!serverCertificate.verify(HandshakeCommon.getSignatureData(serverHello, clientHello), + handshakeVerification.getSignature().toByteArray())) { logger.error("Server failed verification: cancelling authentication"); joinStatus.setErrorMessage(AUTHENTICATION_FAILURE); ctx.channel().close(); 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 ddbb6a925..e1a648a7a 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 @@ -26,7 +26,8 @@ public final class HandshakeCommon { * @return */ public static byte[] generateMasterSecret(byte[] preMasterSecret, byte[] clientRandom, byte[] serverRandom) { - return SecretGenerator.generate(preMasterSecret, SecretGenerator.MASTER_SECRET_LABEL, Bytes.concat(clientRandom, serverRandom), SecretGenerator.MASTER_SECRET_LENGTH); + return SecretGenerator.generate(preMasterSecret, SecretGenerator.MASTER_SECRET_LABEL, + Bytes.concat(clientRandom, serverRandom), SecretGenerator.MASTER_SECRET_LENGTH); } /** @@ -39,7 +40,8 @@ public final class HandshakeCommon { */ public static SecretKeySpec generateSymmetricKey(byte[] masterSecret, byte[] clientRandom, byte[] serverRandom) { return new SecretKeySpec(SecretGenerator.generate(masterSecret, SecretGenerator.KEY_EXPANSION, - Bytes.concat(clientRandom, serverRandom), IdentityConstants.SYMMETRIC_ENCRYPTION_KEY_LENGTH), IdentityConstants.SYMMETRIC_ENCRYPTION_ALGORITHM); + Bytes.concat(clientRandom, serverRandom), IdentityConstants.SYMMETRIC_ENCRYPTION_KEY_LENGTH), + IdentityConstants.SYMMETRIC_ENCRYPTION_ALGORITHM); } /** diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetClient.java b/engine/src/main/java/org/terasology/engine/network/internal/NetClient.java index 0d2ff3399..8c31e9815 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetClient.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetClient.java @@ -441,7 +441,8 @@ public class NetClient extends AbstractClient implements WorldChangeListener { EntityRef currentEntity = networkSystem.getEntity(updateMessage.getNetId()); if (networkSystem.getOwner(currentEntity) == this) { - entitySerializer.deserializeOnto(currentEntity, updateMessage.getEntity(), new ServerComponentFieldCheck(false, true)); + entitySerializer.deserializeOnto(currentEntity, updateMessage.getEntity(), + new ServerComponentFieldCheck(false, true)); } } } @@ -455,7 +456,8 @@ public class NetClient extends AbstractClient implements WorldChangeListener { logger.error("Sending non-existent entity update for netId {}", netId); } boolean isOwner = networkSystem.getOwner(entity) == this; - EntityData.PackedEntity entityData = entitySerializer.serialize(entity, addedComponents.get(netId), dirtyComponents.get(netId), removedComponents.get(netId), + EntityData.PackedEntity entityData = entitySerializer.serialize(entity, addedComponents.get(netId), + dirtyComponents.get(netId), removedComponents.get(netId), new ServerComponentFieldCheck(isOwner, false)); if (entityData != null) { message.addUpdateEntity(NetData.UpdateEntityMessage.newBuilder().setEntity(entityData).setNetId(netId)); @@ -488,7 +490,8 @@ public class NetClient extends AbstractClient implements WorldChangeListener { } // Note: Send owner->server fields on initial create Client owner = networkSystem.getOwner(entity); - EntityData.PackedEntity entityData = entitySerializer.serialize(entity, true, new ServerComponentFieldCheck(owner == this, true)).build(); + EntityData.PackedEntity entityData = entitySerializer.serialize(entity, true, + new ServerComponentFieldCheck(owner == this, true)).build(); NetData.CreateEntityMessage.Builder createMessage = NetData.CreateEntityMessage.newBuilder().setEntity(entityData); BlockComponent blockComponent = entity.getComponent(BlockComponent.class); if (blockComponent != null) { 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 19e3570f2..b000fa491 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 @@ -849,7 +849,9 @@ public class NetworkSystemImpl implements EntityChangeSubscriber, NetworkSystem client.connected(entityManager, entitySerializer, eventSerializer, eventLibrary); client.send(NetData.NetMessage.newBuilder().setJoinComplete( - NetData.JoinCompleteMessage.newBuilder().setClientId(client.getEntity().getComponent(NetworkComponent.class).getNetworkId())).build()); + NetData.JoinCompleteMessage.newBuilder().setClientId(client.getEntity() + .getComponent(NetworkComponent.class) + .getNetworkId())).build()); clientList.add(client); netClientList.add(client); clientPlayerLookup.put(client.getEntity(), client); 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 8e72f7881..d69c01a6d 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 @@ -66,7 +66,8 @@ public class ServerHandshakeHandler extends ChannelInboundHandlerAdapter { } } - private void processClientHandshake(NetData.HandshakeHello clientHello, NetData.HandshakeVerification handshakeVerification, ChannelHandlerContext ctx) { + private void processClientHandshake(NetData.HandshakeHello clientHello, NetData.HandshakeVerification handshakeVerification, + ChannelHandlerContext ctx) { logger.info("Received client certificate"); PublicIdentityCertificate clientCert = NetMessageUtil.convert(clientHello.getCertificate()); @@ -98,8 +99,11 @@ public class ServerHandshakeHandler extends ChannelInboundHandlerAdapter { private void processNewIdentityRequest(NetData.NewIdentityRequest newIdentityRequest, ChannelHandlerContext ctx) { logger.info("Received new identity request"); try { - byte[] preMasterSecret = config.getSecurity().getServerPrivateCertificate().decrypt(newIdentityRequest.getPreMasterSecret().toByteArray()); - byte[] masterSecret = HandshakeCommon.generateMasterSecret(preMasterSecret, newIdentityRequest.getRandom().toByteArray(), serverRandom); + byte[] preMasterSecret = config.getSecurity() + .getServerPrivateCertificate() + .decrypt(newIdentityRequest.getPreMasterSecret().toByteArray()); + byte[] masterSecret = HandshakeCommon.generateMasterSecret(preMasterSecret, + newIdentityRequest.getRandom().toByteArray(), serverRandom); // Generate a certificate pair for the client CertificatePair clientCertificates = new CertificateGenerator().generate(config.getSecurity().getServerPrivateCertificate()); @@ -111,11 +115,13 @@ public class ServerHandshakeHandler extends ChannelInboundHandlerAdapter { byte[] encryptedCert = null; try { - SecretKeySpec key = HandshakeCommon.generateSymmetricKey(masterSecret, newIdentityRequest.getRandom().toByteArray(), serverRandom); + SecretKeySpec key = HandshakeCommon.generateSymmetricKey(masterSecret, + newIdentityRequest.getRandom().toByteArray(), serverRandom); Cipher cipher = Cipher.getInstance(IdentityConstants.SYMMETRIC_ENCRYPTION_ALGORITHM); cipher.init(Cipher.ENCRYPT_MODE, key); encryptedCert = cipher.doFinal(certificateData.toByteArray()); - } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) { + } catch (NoSuchAlgorithmException | NoSuchPaddingException + | InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) { logger.error("Unexpected error encrypting certificate for sending, ending connection attempt", e); ctx.channel().close(); return; 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 9389a3c01..812d37a13 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java @@ -9,7 +9,8 @@ import org.terasology.engine.particles.rendering.ParticleRenderingData; import java.util.stream.Stream; /** - * Component system responsible for keeping track of all {@link org.terasology.engine.particles.components.ParticleEmitterComponent} components and updating them. + * Component system responsible for keeping track of all {@link org.terasology.engine.particles.components.ParticleEmitterComponent} + * components and updating them. * Also maintains a registry of generator and affector functions to be used when processing generators * and affectors during a particle system update. */ @@ -18,7 +19,8 @@ import java.util.stream.Stream; public interface ParticleSystemManager { /** - * Gets all current emitters that have a given particle data component and returns a stream of all particle pools and their associated data for rendering. + * Gets all current emitters that have a given particle data component and returns a stream of all particle pools + * and their associated data for rendering. * A particle data component stores information used to define how the particles of the emitter it is attached to are rendered. * * @param particleDataComponent The particle data component to select emitters by. 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 ac9bfc6a9..d75c1b7a7 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java @@ -99,8 +99,10 @@ public class ParticleSystemManagerImpl extends BaseComponentSystem implements Up @Override public Stream getParticleEmittersByDataComponent(Class particleDataComponent) { return particleUpdater.getParticleEmitters().stream() - .filter(emitter -> emitter.ownerEntity.hasComponent(particleDataComponent)) // filter emitters, whose owning entity has a particleDataComponent - .filter(distinctByKey(emitter -> emitter.particlePool)) // filter emitters referencing a unique particle pool + // filter emitters, whose owning entity has a particleDataComponent + .filter(emitter -> emitter.ownerEntity.hasComponent(particleDataComponent)) + // filter emitters referencing a unique particle pool + .filter(distinctByKey(emitter -> emitter.particlePool)) .map(emitter -> new ParticleRenderingData<>( emitter.ownerEntity.getComponent(particleDataComponent), emitter.particlePool 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 55b52f4ab..77fc0ddad 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 @@ -55,12 +55,14 @@ public class ParticleEmitterComponent implements Component { public boolean enabled = true; /** - * The remaining life time of this emitter in seconds, the emitter will auto-remove upon reaching 0 TODO: Implement emitter lifetime + * The remaining life time of this emitter in seconds, the emitter will auto-remove upon reaching 0 + * TODO: Implement emitter lifetime */ public float lifeTime = INDEFINITE_EMITTER_LIFETIME; /** - * The maximum amount of particle this emitter can emit before auto-removing, the emitter will auto-remove upon reaching 0 TODO: Implement emitter max spawns + * The maximum amount of particle this emitter can emit before auto-removing, the emitter will auto-remove upon reaching 0 + * TODO: Implement emitter max spawns */ public int particleSpawnsLeft = INFINITE_PARTICLE_SPAWNS; 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 3c2577821..609826864 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 @@ -10,7 +10,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * This annotation is used to mark a {@link ParticleSystemFunction} to be registered in by the {@link org.terasology.engine.particles.updating.ParticleUpdater}. + * This annotation is used to mark a {@link ParticleSystemFunction} to be registered in + * by the {@link org.terasology.engine.particles.updating.ParticleUpdater}. */ @API @Retention(RetentionPolicy.RUNTIME) diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/ReadWriteStorageManager.java b/engine/src/main/java/org/terasology/engine/persistence/internal/ReadWriteStorageManager.java index 293f6b9df..5a9a4f65c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/ReadWriteStorageManager.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/ReadWriteStorageManager.java @@ -67,7 +67,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -public final class ReadWriteStorageManager extends AbstractStorageManager implements EntityDestroySubscriber, EntityChangeSubscriber, DelayedEntityRefFactory { +public final class ReadWriteStorageManager extends AbstractStorageManager + implements EntityDestroySubscriber, EntityChangeSubscriber, DelayedEntityRefFactory { private static final Logger logger = LoggerFactory.getLogger(ReadWriteStorageManager.class); private final TaskMaster saveThreadManager; @@ -113,7 +114,8 @@ public final class ReadWriteStorageManager extends AbstractStorageManager implem public ReadWriteStorageManager(Path savePath, ModuleEnvironment environment, EngineEntityManager entityManager, BlockManager blockManager, ExtraBlockDataManager extraDataManager, RecordAndReplaySerializer recordAndReplaySerializer, - RecordAndReplayUtils recordAndReplayUtils, RecordAndReplayCurrentStatus recordAndReplayCurrentStatus) throws IOException { + RecordAndReplayUtils recordAndReplayUtils, RecordAndReplayCurrentStatus recordAndReplayCurrentStatus) + throws IOException { this(savePath, environment, entityManager, blockManager, extraDataManager, true, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus); } diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializer.java index 8bbf443a2..2ef599a75 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializer.java @@ -153,7 +153,8 @@ public class ComponentSerializer { * @param context The module this component is being deserialized from, or null if it isn't within a module * @return The target component. */ - public Component deserializeOnto(Component target, EntityData.Component componentData, FieldSerializeCheck fieldCheck, Module context) { + public Component deserializeOnto(Component target, EntityData.Component componentData, + FieldSerializeCheck fieldCheck, Module context) { ComponentMetadata componentMetadata = getComponentMetadata(componentData, context); if (componentMetadata != null) { return deserializeOnto(target, componentData, componentMetadata, fieldCheck); 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 c020ddf75..a655527b7 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 @@ -96,7 +96,8 @@ public final class EntityDataJSONFormat { } @Override - public EntityData.GlobalStore deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public EntityData.GlobalStore deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { EntityData.GlobalStore.Builder world = EntityData.GlobalStore.newBuilder(); if (json.isJsonObject()) { JsonObject jsonObject = json.getAsJsonObject(); @@ -137,7 +138,8 @@ public final class EntityDataJSONFormat { private static class ComponentBuilderHandler implements JsonDeserializer { @Override - public EntityData.Component.Builder deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public EntityData.Component.Builder deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { EntityData.Component.Builder component = EntityData.Component.newBuilder(); JsonObject jsonObject = json.getAsJsonObject(); for (Map.Entry entry : jsonObject.entrySet()) { @@ -183,7 +185,8 @@ public final class EntityDataJSONFormat { } @Override - public EntityData.Entity deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public EntityData.Entity deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { EntityData.Entity.Builder entity = EntityData.Entity.newBuilder(); JsonObject jsonObject = json.getAsJsonObject(); @@ -252,7 +255,8 @@ public final class EntityDataJSONFormat { } @Override - public EntityData.Prefab deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public EntityData.Prefab deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { EntityData.Prefab.Builder prefab = EntityData.Prefab.newBuilder(); JsonObject jsonObject = json.getAsJsonObject(); @@ -339,7 +343,8 @@ public final class EntityDataJSONFormat { } @Override - public EntityData.Value deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public EntityData.Value deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { EntityData.Value.Builder value = EntityData.Value.newBuilder(); if (json.isJsonPrimitive()) { extractPrimitive(value, json); 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 986272e57..410e0d557 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 @@ -109,7 +109,8 @@ public class EventSerializer { if (eventMetadata == null) { throw new SerializationException("Unregistered event type: " + event.getClass()); } else if (!eventMetadata.isConstructable()) { - throw new SerializationException("Cannot serialize event '" + eventMetadata + "' - lacks default constructor so cannot be deserialized"); + throw new SerializationException("Cannot serialize event '" + eventMetadata + + "' - lacks default constructor so cannot be deserialized"); } EntityData.Event.Builder eventData = EntityData.Event.newBuilder(); serializeEventType(event, eventData); @@ -118,7 +119,9 @@ public class EventSerializer { ByteString.Output fieldIds = ByteString.newOutput(); for (ReplicatedFieldMetadata field : eventMetadata.getFields()) { if (field.isReplicated()) { - EntityData.Value serializedValue = ((ProtobufPersistedData) eventSerializer.serialize(field, event, persistedDataSerializer)).getValue(); + EntityData.Value serializedValue = ((ProtobufPersistedData) eventSerializer + .serialize(field, event, persistedDataSerializer)) + .getValue(); if (serializedValue != null) { eventData.addFieldValue(serializedValue); fieldIds.write(field.getId()); 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 f96a4eb70..29defc653 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 @@ -116,7 +116,8 @@ public class NetworkEntitySerializer { entity.setComponentFieldCounts(componentFieldCounts.toByteString()); for (Component prefabComponent : prefab.iterateComponents()) { - if (!presentClasses.contains(prefabComponent.getClass()) && componentSerializeCheck.serialize(componentLibrary.getMetadata(prefabComponent.getClass()))) { + if (!presentClasses.contains(prefabComponent.getClass()) + && componentSerializeCheck.serialize(componentLibrary.getMetadata(prefabComponent.getClass()))) { entity.addRemovedComponent(idTable.get(prefabComponent.getClass())); } } @@ -124,7 +125,8 @@ public class NetworkEntitySerializer { } private void serializeComponentDelta(Component oldComponent, Component newComponent, FieldSerializeCheck fieldCheck, - EntityData.PackedEntity.Builder entityData, ByteString.Output entityFieldIds, ByteString.Output componentFieldCounts, + EntityData.PackedEntity.Builder entityData, + ByteString.Output entityFieldIds, ByteString.Output componentFieldCounts, boolean componentInitial) { ComponentMetadata componentMetadata = componentLibrary.getMetadata(oldComponent.getClass()); if (componentMetadata == null) { @@ -158,7 +160,8 @@ public class NetworkEntitySerializer { } private void serializeComponentFull(Component component, boolean ignoreIfNoFields, FieldSerializeCheck fieldCheck, - EntityData.PackedEntity.Builder entityData, ByteString.Output entityFieldIds, ByteString.Output componentFieldCounts, + EntityData.PackedEntity.Builder entityData, + ByteString.Output entityFieldIds, ByteString.Output componentFieldCounts, boolean componentInitial) { ComponentMetadata componentMetadata = componentLibrary.getMetadata(component.getClass()); if (componentMetadata == null) { @@ -264,12 +267,14 @@ public class NetworkEntitySerializer { if (component == null) { logger.error("Non-existent component marked as added: {}", componentType); } - serializeComponentFull(entityRef.getComponent(componentType), false, fieldCheck, entity, fieldIds, componentFieldCounts, true); + serializeComponentFull(entityRef.getComponent(componentType), false, fieldCheck, entity, fieldIds, + componentFieldCounts, true); } for (Class componentType : changed) { Component comp = entityRef.getComponent(componentType); if (comp != null) { - serializeComponentFull(comp, true, fieldCheck, entity, fieldIds, componentFieldCounts, false); + serializeComponentFull(comp, true, fieldCheck, entity, fieldIds, + componentFieldCounts, false); } else { logger.error("Non-existent component marked as changed: {}", componentType); } diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/PrefabSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/PrefabSerializer.java index f0ef1f379..4bb8c6d54 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/PrefabSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/PrefabSerializer.java @@ -75,7 +75,8 @@ public class PrefabSerializer { // Delta off the parent for (Component component : prefab.iterateComponents()) { if (prefab.getParent() != null && prefab.getParent().hasComponent(component.getClass())) { - EntityData.Component serializedComponent = componentSerializer.serialize(prefab.getParent().getComponent(component.getClass()), component); + EntityData.Component serializedComponent = + componentSerializer.serialize(prefab.getParent().getComponent(component.getClass()), component); if (serializedComponent != null) { prefabData.addComponent(serializedComponent); } 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 1c25140af..63de85160 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 @@ -208,7 +208,8 @@ public class ProtobufPersistedData implements PersistedData, PersistedDataArray @Override public boolean isNull() { - return !data.hasBytes() && data.getBooleanCount() + data.getFloatCount() + data.getDoubleCount() + data.getIntegerCount() + data.getLongCount() + return !data.hasBytes() && data.getBooleanCount() + data.getFloatCount() + data.getDoubleCount() + + data.getIntegerCount() + data.getLongCount() + data.getStringCount() + data.getValueCount() + data.getNameValueCount() == 0; } 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 986323ff1..0d81e6c40 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 @@ -552,7 +552,8 @@ public class BulletPhysics implements PhysicsEngine { return true; } } else { - logger.warn("Trying to create trigger for entity without ShapeComponent or without LocationComponent or without TriggerComponent. Entity: {}", entity); + logger.warn("Trying to create trigger for entity without ShapeComponent or without LocationComponent " + + "or without TriggerComponent. Entity: {}", entity); return false; } } 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 4d97daadd..b44b9353e 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 @@ -50,7 +50,8 @@ public class BulletSweepCallback extends ClosestConvexResultCallback implements Matrix4f from = new Matrix4f().setTranslation(fromWorld); Matrix4f to = new Matrix4f().setTranslation(toWorld); Matrix4f targetTransform = this.getHitCollisionObject().getWorldTransform(); - btDiscreteDynamicsWorld.rayTestSingle(from, to, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), targetTransform, resultCallback); + btDiscreteDynamicsWorld.rayTestSingle(from, to, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), + targetTransform, resultCallback); if (resultCallback.hasHit()) { foundSlope = true; Vector3f result = new Vector3f(); @@ -68,7 +69,8 @@ public class BulletSweepCallback extends ClosestConvexResultCallback implements from = new Matrix4f().setTranslation(fromWorld); to = new Matrix4f().setTranslation(toWorld); targetTransform = this.getHitCollisionObject().getWorldTransform(); - btDiscreteDynamicsWorld.rayTestSingle(from, to, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), targetTransform, resultCallback); + btDiscreteDynamicsWorld.rayTestSingle(from, to, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), + targetTransform, resultCallback); if (resultCallback.hasHit()) { foundSlope = true; Vector3f hitNormal = new 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 aea33271e..07310f581 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 @@ -34,8 +34,10 @@ public class BulletCompoundShape extends BulletCollisionShape implements Compoun public void addChildShape(Vector3fc origin, Quaternionfc rotation, float scale, CollisionShape collisionShape) { BulletCollisionShape bulletCollisionShape = (BulletCollisionShape) collisionShape; - compoundShape.addChildShape(new Matrix4f().translationRotateScale(origin, rotation, scale), ((BulletCollisionShape) collisionShape).underlyingShape); - childList.add(new BulletCompoundShapeChild(origin, rotation, scale, bulletCollisionShape, compoundShape.getChildShape(compoundShape.getNumChildShapes() - 1))); + compoundShape.addChildShape(new Matrix4f().translationRotateScale(origin, rotation, scale), + ((BulletCollisionShape) collisionShape).underlyingShape); + childList.add(new BulletCompoundShapeChild(origin, rotation, scale, bulletCollisionShape, + compoundShape.getChildShape(compoundShape.getNumChildShapes() - 1))); } // TODO: Add removeChildShape if needed @@ -46,7 +48,8 @@ public class BulletCompoundShape extends BulletCollisionShape implements Compoun for (BulletCompoundShapeChild child : childList) { Matrix4f transform = new Matrix4f().rotate(rot).mul(child.transform); shape.compoundShape.addChildShape(transform, child.childShape.underlyingShape); - shape.childList.add(new BulletCompoundShapeChild(transform, child.childShape, compoundShape.getChildShape(compoundShape.getNumChildShapes() - 1))); + shape.childList.add(new BulletCompoundShapeChild(transform, child.childShape, + compoundShape.getChildShape(compoundShape.getNumChildShapes() - 1))); } return shape; } @@ -57,13 +60,15 @@ public class BulletCompoundShape extends BulletCollisionShape implements Compoun public btCollisionShape compoundShapeChild; private final Matrix4f transform = new Matrix4f(); - private BulletCompoundShapeChild(Matrix4fc trans, BulletCollisionShape childShape, btCollisionShape compoundShapeChild) { + private BulletCompoundShapeChild(Matrix4fc trans, BulletCollisionShape childShape, + btCollisionShape compoundShapeChild) { this.transform.set(trans); this.childShape = childShape; this.compoundShapeChild = compoundShapeChild; } - private BulletCompoundShapeChild(Vector3fc origin, Quaternionfc rotation, float scale, BulletCollisionShape childShape, btCollisionShape compoundShapeChild) { + private BulletCompoundShapeChild(Vector3fc origin, Quaternionfc rotation, float scale, BulletCollisionShape childShape, + btCollisionShape compoundShapeChild) { this.transform.translationRotateScale(origin, rotation, scale); this.childShape = childShape; this.compoundShapeChild = compoundShapeChild; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockFluidWorld.java b/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockFluidWorld.java index 3bff3ee61..a0e90a784 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockFluidWorld.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockFluidWorld.java @@ -45,9 +45,12 @@ public class VoxelBlockFluidWorld implements VoxelWorld { blockConsInf = new btRigidBody.btRigidBodyConstructionInfo(0, blockMotionState, worldShape, new Vector3f()); rigidBody = new btRigidBody(blockConsInf); - rigidBody.setCollisionFlags(btCollisionObject.CollisionFlags.CF_STATIC_OBJECT | rigidBody.getCollisionFlags()); // voxel world is added to static collision flag - short mask = (short) StandardCollisionGroup.LIQUID.getFlag(); // interacts with liquid only - discreteDynamicsWorld.addRigidBody(rigidBody, physics.combineGroups(StandardCollisionGroup.LIQUID), mask); // adds rigid body to world + // voxel world is added to static collision flag + rigidBody.setCollisionFlags(btCollisionObject.CollisionFlags.CF_STATIC_OBJECT | rigidBody.getCollisionFlags()); + // interacts with liquid only + short mask = (short) StandardCollisionGroup.LIQUID.getFlag(); + // adds rigid body to world + discreteDynamicsWorld.addRigidBody(rigidBody, physics.combineGroups(StandardCollisionGroup.LIQUID), mask); } diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockWorld.java b/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockWorld.java index 0b4f73566..88434ffb8 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockWorld.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/world/VoxelBlockWorld.java @@ -45,9 +45,12 @@ public class VoxelBlockWorld implements VoxelWorld { blockConsInf = new btRigidBody.btRigidBodyConstructionInfo(0, blockMotionState, worldShape, new Vector3f()); rigidBody = new btRigidBody(blockConsInf); - rigidBody.setCollisionFlags(btCollisionObject.CollisionFlags.CF_STATIC_OBJECT | rigidBody.getCollisionFlags()); // voxel world is added to static collision flag - short mask = (short) (~(StandardCollisionGroup.STATIC.getFlag() | StandardCollisionGroup.LIQUID.getFlag())); // interacts with anything but static and liquid - discreteDynamicsWorld.addRigidBody(rigidBody, physics.combineGroups(StandardCollisionGroup.WORLD), mask); // adds rigid body to world + // voxel world is added to static collision flag + rigidBody.setCollisionFlags(btCollisionObject.CollisionFlags.CF_STATIC_OBJECT | rigidBody.getCollisionFlags()); + // interacts with anything but static and liquid + short mask = (short) (~(StandardCollisionGroup.STATIC.getFlag() | StandardCollisionGroup.LIQUID.getFlag())); + // adds rigid body to world + discreteDynamicsWorld.addRigidBody(rigidBody, physics.combineGroups(StandardCollisionGroup.WORLD), mask); } 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 9a2fab64b..9d7a1b700 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 @@ -58,7 +58,8 @@ public class PhysicsSystem extends BaseComponentSystem implements UpdateSubscrib private static final Logger logger = LoggerFactory.getLogger(PhysicsSystem.class); private static final long TIME_BETWEEN_NETSYNCS = 500; - private static final CollisionGroup[] DEFAULT_COLLISION_GROUP = {StandardCollisionGroup.WORLD, StandardCollisionGroup.CHARACTER, StandardCollisionGroup.DEFAULT}; + private static final CollisionGroup[] DEFAULT_COLLISION_GROUP = + {StandardCollisionGroup.WORLD, StandardCollisionGroup.CHARACTER, StandardCollisionGroup.DEFAULT}; private static final float COLLISION_DAMPENING_MULTIPLIER = 0.5f; @In private Time time; @@ -206,13 +207,16 @@ public class PhysicsSystem extends BaseComponentSystem implements UpdateSubscrib } if (hitBlock.isPenetrable()) { if (!hitInfo.getEntity().hasComponent(BlockComponent.class)) { - entity.send(new EntityImpactEvent(hitInfo.getHitPoint(), hitInfo.getHitNormal(), comp.velocity, fDistanceThisFrame, hitInfo.getEntity())); + entity.send(new EntityImpactEvent(hitInfo.getHitPoint(), hitInfo.getHitNormal(), comp.velocity, + fDistanceThisFrame, hitInfo.getEntity())); break; } - fDistanceThisFrame = fDistanceThisFrame - fTravelledDistance; // decrease the remaining distance to check if we hit a block + // decrease the remaining distance to check if we hit a block + fDistanceThisFrame = fDistanceThisFrame - fTravelledDistance; vLocation = hitInfo.getHitPoint(); } else { - entity.send(new BlockImpactEvent(hitInfo.getHitPoint(), hitInfo.getHitNormal(), comp.velocity, fDistanceThisFrame, hitInfo.getEntity())); + entity.send(new BlockImpactEvent(hitInfo.getHitPoint(), hitInfo.getHitNormal(), comp.velocity, + fDistanceThisFrame, hitInfo.getEntity())); break; } } else { 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 f67de1245..95e24f7ae 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 @@ -9,7 +9,8 @@ import org.joml.Quaternionf; import org.joml.Vector3f; /** - * A rigid body is a physics object whose movement and location is controlled by the physics engine. Rigid bodies move under gravity and bounce off each other and the world. + * A rigid body is a physics object whose movement and location is controlled by the physics engine. + * Rigid bodies move under gravity and bounce off each other and the world. *

* After being removed from the physics engine this object is no longer valid and should not be used anymore. *

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 33e39242d..d32b5a51a 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java @@ -154,7 +154,8 @@ public class EventSystemReplayImpl implements EventSystem { if (Thread.currentThread() != mainThread) { pendingEvents.offer(new PendingEvent(entity, event, component)); } else { - SetMultimap, EventSystemReplayImpl.EventHandlerInfo> handlers = componentSpecificHandlers.get(event.getClass()); + SetMultimap, EventSystemReplayImpl.EventHandlerInfo> handlers = + componentSpecificHandlers.get(event.getClass()); if (handlers != null) { List eventHandlers = Lists.newArrayList(handlers.get(component.getClass())); eventHandlers.sort(priorityComparator); @@ -209,7 +210,8 @@ public class EventSystemReplayImpl implements EventSystem { */ private void finishReplay() { recordedEventStore.popEvents(); - recordAndReplayCurrentStatus.setStatus(RecordAndReplayStatus.REPLAY_FINISHED); // stops the replay if every recorded event was already replayed + // stops replay if all recorded events already replayed + recordAndReplayCurrentStatus.setStatus(RecordAndReplayStatus.REPLAY_FINISHED); } private void loadNextRecordedEventFile() { @@ -233,7 +235,8 @@ public class EventSystemReplayImpl implements EventSystem { long beginTime = System.currentTimeMillis(); for (RecordedEvent re = recordedEvents.peek(); re != null; re = recordedEvents.peek()) { long passedTime = System.currentTimeMillis() - this.replayEventsLoadTime; - //Waits until the time of reproduction is right or until 'maxDuration' miliseconds have already passed since this method was called + //Waits until the time of reproduction is right or until 'maxDuration' miliseconds have already passed + // since this method was called while (passedTime < re.getTimestamp()) { passedTime = System.currentTimeMillis() - this.replayEventsLoadTime; if ((System.currentTimeMillis() - beginTime) >= maxDuration) { @@ -362,7 +365,8 @@ public class EventSystemReplayImpl implements EventSystem { mainThread = Thread.currentThread(); } - private void addEventHandler(Class type, EventSystemReplayImpl.EventHandlerInfo handler, Collection> components) { + private void addEventHandler(Class type, EventSystemReplayImpl.EventHandlerInfo handler, + Collection> components) { if (components.isEmpty()) { generalHandlers.put(type, handler); for (Class childType : childEvents.get(type)) { @@ -378,8 +382,10 @@ public class EventSystemReplayImpl implements EventSystem { } } - private void addToComponentSpecificHandlers(Class type, EventSystemReplayImpl.EventHandlerInfo handlerInfo, Class c) { - SetMultimap, EventSystemReplayImpl.EventHandlerInfo> componentMap = componentSpecificHandlers.get(type); + private void addToComponentSpecificHandlers(Class type, EventSystemReplayImpl.EventHandlerInfo handlerInfo, + Class c) { + SetMultimap, EventSystemReplayImpl.EventHandlerInfo> componentMap = + componentSpecificHandlers.get(type); if (componentMap == null) { componentMap = HashMultimap.create(); componentSpecificHandlers.put(type, componentMap); @@ -388,21 +394,27 @@ public class EventSystemReplayImpl implements EventSystem { } @Override - public void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, Class... componentTypes) { + public void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, + Class... componentTypes) { registerEventReceiver(eventReceiver, eventClass, EventPriority.PRIORITY_NORMAL, componentTypes); } @Override - public void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, int priority, Class... componentTypes) { - EventSystemReplayImpl.EventHandlerInfo info = new EventSystemReplayImpl.ReceiverEventHandlerInfo<>(eventReceiver, priority, componentTypes); + public void registerEventReceiver(EventReceiver eventReceiver, Class eventClass, int priority, + Class... componentTypes) { + EventSystemReplayImpl.EventHandlerInfo info = + new EventSystemReplayImpl.ReceiverEventHandlerInfo<>(eventReceiver, priority, componentTypes); addEventHandler(eventClass, info, Arrays.asList(componentTypes)); } @Override - public void unregisterEventReceiver(EventReceiver eventReceiver, Class eventClass, Class... componentTypes) { - SetMultimap, EventSystemReplayImpl.EventHandlerInfo> eventHandlerMap = componentSpecificHandlers.get(eventClass); + public void unregisterEventReceiver(EventReceiver eventReceiver, Class eventClass, + Class... componentTypes) { + SetMultimap, EventSystemReplayImpl.EventHandlerInfo> eventHandlerMap = + componentSpecificHandlers.get(eventClass); if (eventHandlerMap != null) { - EventSystemReplayImpl.ReceiverEventHandlerInfo testReceiver = new EventSystemReplayImpl.ReceiverEventHandlerInfo<>(eventReceiver, 0, componentTypes); + EventSystemReplayImpl.ReceiverEventHandlerInfo testReceiver = + new EventSystemReplayImpl.ReceiverEventHandlerInfo<>(eventReceiver, 0, componentTypes); for (Class c : componentTypes) { eventHandlerMap.remove(c, testReceiver); for (Class childType : childEvents.get(eventClass)) { 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 b9d280f16..62d7f38ac 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java @@ -13,18 +13,21 @@ package org.terasology.engine.recording; * every time an event is sent. * * The RECORDING status will also make the {@link DirectionAndOriginPosRecorder} and {@link CharacterStateEventPositionMap} - * record the data they are supposed to. Every time the game is saved during the recording, {@link org.terasology.engine.persistence.internal.SaveTransaction}'s + * record the data they are supposed to. + * Every time the game is saved during the recording, {@link org.terasology.engine.persistence.internal.SaveTransaction}'s * saveRecordingData() is called and the events in the {@link RecordedEventStore} are saved in an "event file", reseting * the store and updating {@link RecordAndReplayUtils}. * * When the game shutdowns with the RECORDING status, the {@link RecordAndReplayUtils}'s shutdownRequested is set to true - * and then every recorded data that was not stored yet will be serialized and stored once {@link org.terasology.engine.persistence.internal.SaveTransaction}'s + * and then every recorded data that was not stored yet will be serialized + * and stored once {@link org.terasology.engine.persistence.internal.SaveTransaction}'s * saveRecordingData() method is called right after the game is saved. Once this is done, the {@link #status} is set to NOT_ACTIVATED. *

*

Replay Workflow

When the user clicks on the "Replay" button on the extras menu, the {@link #status} * is set to PREPEARING_REPLAY. During the load process of a Replay, the {@link org.terasology.engine.core.modes.loadProcesses.InitialiseWorld} - * class gets the game path from the "recordings" folder instead of the "saves" one, and the {@link org.terasology.engine.core.bootstrap.EntitySystemSetupUtil} - * creates an {@link EventSystemReplayImpl} instead of {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl}. + * class gets the game path from the "recordings" folder instead of the "saves" one, + * and the {@link org.terasology.engine.core.bootstrap.EntitySystemSetupUtil} creates an {@link EventSystemReplayImpl} + * instead of {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl}. * * When the game is loading, the InitialiseRecordAndReplay load process will set the {@link #status} to REPLAYING and deserialize * the recorded data, updating {@link RecordedEventStore},{@link RecordAndReplayUtils}, {@link CharacterStateEventPositionMap} @@ -36,7 +39,8 @@ package org.terasology.engine.recording; * If there are, the store is updated and the event system continues to replay the events. It is important to notice that * the REPLAYING status also makes the {@link DirectionAndOriginPosRecorderList} and {@link CharacterStateEventPositionMap} * to replace some variables for the recorded ones. Once there is no more events to be replayed, the {@link #status} is set to - * REPLAY_FINISHED and the {@link EventSystemReplayImpl} will work exactly like {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl}. + * REPLAY_FINISHED and the {@link EventSystemReplayImpl} will work exactly + * like {@link org.terasology.engine.entitySystem.event.internal.EventSystemImpl}. * * When the game is shutdown during this state, {@link RecordAndReplayUtils}'s shutdownRequested variable is set to true, * and then when {@link org.terasology.engine.persistence.internal.SaveTransaction}'s run() method is called, the {@link #status} will be diff --git a/engine/src/main/java/org/terasology/engine/reflection/package-info.java b/engine/src/main/java/org/terasology/engine/reflection/package-info.java index d72df6a59..ac41eff5b 100644 --- a/engine/src/main/java/org/terasology/engine/reflection/package-info.java +++ b/engine/src/main/java/org/terasology/engine/reflection/package-info.java @@ -2,7 +2,8 @@ // 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 + * 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 * framework. *

* To support this functionality, a copy-strategy library is used to provide copying support for types. This is used instead of cloning because 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 becf2bcc6..8f4b52c31 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 @@ -59,7 +59,8 @@ public class ByteCodeReflectFactory implements ReflectFactory { CtMethod method = CtNewMethod.make("public Object construct() { return new " + type.getName() + "();}", constructorClass); constructorClass.addMethod(method); - return (ObjectConstructor) (constructorClass.toClass(type.getClassLoader(), type.getProtectionDomain()).getConstructor().newInstance()); + return (ObjectConstructor) (constructorClass.toClass(type.getClassLoader(), type.getProtectionDomain()) + .getConstructor().newInstance()); } catch (InstantiationException | IllegalAccessException | InvocationTargetException | CannotCompileException e) { logger.error("Error instantiating constructor object for '{}', falling back on reflection", type, e); return backupFactory.createConstructor(type); @@ -118,7 +119,8 @@ public class ByteCodeReflectFactory implements ReflectFactory { try { fieldIndex = fieldAccess.getIndex(field.getName()); } catch (IllegalArgumentException e) { - throw new InaccessibleFieldException("Failed to create accessor for field '" + field.getName() + "' of type '" + ownerType.getName() + "'", e); + throw new InaccessibleFieldException("Failed to create accessor for field '" + field.getName() + + "' of type '" + ownerType.getName() + "'", e); } } } 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 4715e9a3c..3900ab896 100644 --- a/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java +++ b/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java @@ -104,7 +104,8 @@ public final class InjectionHelper { * @param clazz The class to instantiate. * @param context The context to use for injection. * @return A new instance of the class to create. - * @throws NoSuchElementException if the injection failed, e.g. if no parameters were available on the context and a default constructor is missing. + * @throws NoSuchElementException if the injection failed, + * e.g. if no parameters were available on the context and a default constructor is missing. */ public static E createWithConstructorInjection(Class clazz, Context context) { return safeCreateWithConstructorInjection(clazz, context).get(); 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 81dc0ca5d..3abc50fa4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java +++ b/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java @@ -60,8 +60,9 @@ public final class RenderHelper { float timeFactor = RefractiveReflectiveBlocksNodeProxy.waveSpeed; for (int i = 0; i < OCEAN_OCTAVES; ++i) { - height += (float) (smoothTriangleWave(timeToTick(days, - timeFactor) + position.x() * OCEAN_WAVE_DIRECTIONS[i].x * waveSize + position.z() * OCEAN_WAVE_DIRECTIONS[i].y * waveSize) * 2.0 - 1.0) * waveIntensity; + height += (float) (smoothTriangleWave(timeToTick(days, timeFactor) + + position.x() * OCEAN_WAVE_DIRECTIONS[i].x * waveSize + + position.z() * OCEAN_WAVE_DIRECTIONS[i].y * waveSize) * 2.0 - 1.0) * waveIntensity; waveSize *= RefractiveReflectiveBlocksNodeProxy.waveSizeFalloff; waveIntensity *= RefractiveReflectiveBlocksNodeProxy.waveIntensityFalloff; diff --git a/engine/src/main/java/org/terasology/engine/rendering/ShaderManagerLwjgl.java b/engine/src/main/java/org/terasology/engine/rendering/ShaderManagerLwjgl.java index 7a34723e1..c1048143e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/ShaderManagerLwjgl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/ShaderManagerLwjgl.java @@ -4,7 +4,6 @@ package org.terasology.engine.rendering; import com.google.common.collect.Sets; import org.lwjgl.Version; -import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; @@ -12,7 +11,6 @@ import org.lwjgl.opengl.GL30; import org.lwjgl.system.Platform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.assets.material.Material; import org.terasology.engine.rendering.assets.material.MaterialData; @@ -20,6 +18,7 @@ import org.terasology.engine.rendering.assets.shader.Shader; import org.terasology.engine.rendering.assets.texture.Texture; import org.terasology.engine.rendering.opengl.GLSLMaterial; import org.terasology.engine.utilities.Assets; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.assets.management.AssetManager; import java.util.Optional; 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 272e58786..9ec8095dc 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 @@ -16,7 +16,8 @@ public class Atlas extends Asset { private Map subtextures = Maps.newHashMap(); /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, + * and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMeshBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMeshBuilder.java index 47d10c368..b21488188 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMeshBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMeshBuilder.java @@ -30,7 +30,8 @@ public class FontMeshBuilder { this.underlineMaterial = underlineMaterial; } - public Map createTextMesh(Font font, List lines, int width, HorizontalAlign alignment, Colorc baseColor, Colorc shadowColor, boolean underline) { + public Map createTextMesh(Font font, List lines, int width, HorizontalAlign alignment, + Colorc baseColor, Colorc shadowColor, boolean underline) { return new Builder(font, lines, width, alignment, baseColor, shadowColor, underline).invoke(); } @@ -52,7 +53,8 @@ public class FontMeshBuilder { private Deque previousColors = new ArrayDeque<>(); private Colorc currentColor; - Builder(Font font, List lines, int width, HorizontalAlign alignment, Colorc baseColor, Colorc shadowColor, boolean baseUnderline) { + Builder(Font font, List lines, int width, HorizontalAlign alignment, + Colorc baseColor, Colorc shadowColor, boolean baseUnderline) { this.font = font; this.lines = lines; this.width = width; @@ -144,9 +146,11 @@ public class FontMeshBuilder { MeshBuilder builder = getBuilderFor(underlineMaterial); if (shadowColor.a() != 0) { addUnderline(builder, underlineStart + SHADOW_HORIZONTAL_OFFSET, underlineEnd + SHADOW_HORIZONTAL_OFFSET, - y + font.getBaseHeight() + SHADOW_VERTICAL_OFFSET + font.getUnderlineOffset(), font.getUnderlineThickness(), shadowColor, SHADOW_DEPTH); + y + font.getBaseHeight() + SHADOW_VERTICAL_OFFSET + font.getUnderlineOffset(), font.getUnderlineThickness(), + shadowColor, SHADOW_DEPTH); } - addUnderline(builder, underlineStart, underlineEnd, y + font.getBaseHeight() + font.getUnderlineOffset(), font.getUnderlineThickness(), currentColor, 0); + addUnderline(builder, underlineStart, underlineEnd, y + font.getBaseHeight() + + font.getUnderlineOffset(), font.getUnderlineThickness(), currentColor, 0); } underlineStart = UNKNOWN; underlineEnd = UNKNOWN; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java index e1edae751..fc82564c2 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java @@ -140,7 +140,9 @@ public class MeshBuilder { int vertexId = vertexCount; textureMapper.initialize(offset, size); for (int i = 0; i < VERTICES.length / 3; i++) { - addVertex(new Vector3f(offset.x() + size.x() * VERTICES[i * 3], offset.y() + size.y() * VERTICES[i * 3 + 1], offset.z() + size.z() * VERTICES[i * 3 + 2])); + addVertex(new Vector3f(offset.x() + size.x() * VERTICES[i * 3], + offset.y() + size.y() * VERTICES[i * 3 + 1], + offset.z() + size.z() * VERTICES[i * 3 + 2])); addTexCoord(textureMapper.map(i, u, v)); } for (int i : INDICES) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ObjMeshFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ObjMeshFormat.java index 828638bf2..fe677dcc2 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ObjMeshFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ObjMeshFormat.java @@ -52,7 +52,8 @@ public class ObjMeshFormat extends AbstractAssetFileFormat { } } - private StandardMeshData processData(List rawVertices, List rawNormals, List rawTexCoords, List rawIndices) throws IOException { + private StandardMeshData processData(List rawVertices, List rawNormals, + List rawTexCoords, List rawIndices) throws IOException { int numIndices = 0; int numVerts = 0; for (int x = 0; x < rawIndices.size(); x++) { 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 1d3ffc02f..7c0493ea9 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 @@ -213,7 +213,8 @@ public abstract class AbstractNode implements Node { success = true; } else { DependencyConnection localBufferPairConnection = - new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, bufferPair, this.getUri()); + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), + DependencyConnection.Type.OUTPUT, bufferPair, this.getUri()); success = addOutputConnection(localBufferPairConnection); } return success; @@ -250,7 +251,8 @@ 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()); + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), + DependencyConnection.Type.OUTPUT, from.getData(), this.getUri()); success = addOutputConnection(localBufferPairConnection); } return success; @@ -258,7 +260,8 @@ public abstract class AbstractNode implements Node { public boolean addOutputBufferPairConnection(int id) { DependencyConnection localBufferPairConnection = - new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), + DependencyConnection.Type.OUTPUT, this.getUri()); return addOutputConnection(localBufferPairConnection); } @@ -270,7 +273,8 @@ public abstract class AbstractNode implements Node { */ protected boolean addInputFboConnection(int id, FboConnection from) { DependencyConnection fboConnection = - new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, from.getData(), this.getUri()); + 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); } @@ -283,7 +287,8 @@ public abstract class AbstractNode implements Node { */ public boolean addInputFboConnection(int id, FBO fboData) { DependencyConnection fboConnection = - new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, fboData, this.getUri()); + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), + DependencyConnection.Type.INPUT, fboData, this.getUri()); return addInputConnection(fboConnection); } @@ -318,7 +323,8 @@ public abstract class AbstractNode implements Node { success = true; } else { DependencyConnection fboConnection = - new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, fboData, this.getUri()); + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), + DependencyConnection.Type.OUTPUT, fboData, this.getUri()); success = addOutputConnection(fboConnection); } return success; @@ -326,7 +332,8 @@ public abstract class AbstractNode implements Node { public boolean addOutputFboConnection(int id) { DependencyConnection fboConnection = - new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); + 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/ModuleRendering.java b/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java index 711c05932..2e0172e07 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java @@ -85,9 +85,11 @@ public abstract class ModuleRendering { protected BufferPair createBufferPair(String primaryBufferName, String secondaryBufferName, ScalingFactors sharedBufferScale, FBO.Type sharedBufferType, FBO.Dimensions scale) { - FBO buffer1 = generateWithDimensions(new FboConfig(new SimpleUri(providingModule + ":fbo." + primaryBufferName), sharedBufferScale, sharedBufferType) + FBO buffer1 = generateWithDimensions(new FboConfig( + new SimpleUri(providingModule + ":fbo." + primaryBufferName), sharedBufferScale, sharedBufferType) .useDepthBuffer().useNormalBuffer().useLightBuffer().useStencilBuffer(), scale); - FBO buffer2 = generateWithDimensions(new FboConfig(new SimpleUri(providingModule + ":fbo." + secondaryBufferName), sharedBufferScale, sharedBufferType) + FBO buffer2 = generateWithDimensions(new FboConfig( + new SimpleUri(providingModule + ":fbo." + secondaryBufferName), sharedBufferScale, sharedBufferType) .useDepthBuffer().useNormalBuffer().useLightBuffer().useStencilBuffer(), scale); return new BufferPair(buffer1, buffer2); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/RenderGraph.java b/engine/src/main/java/org/terasology/engine/rendering/dag/RenderGraph.java index 0875fbf14..356e89bdf 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/RenderGraph.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/RenderGraph.java @@ -52,7 +52,8 @@ public class RenderGraph { } if (akaNodeMap.containsKey(nodeAka)) { Node aNode = akaNodeMap.get(nodeAka); - logger.info("Node " + nodeUri + " also known as" + nodeAka + " already matches existing node with uri " + aNode.getUri() + " - attempting replacing..."); + logger.info("Node " + nodeUri + " also known as" + nodeAka + " already matches existing node with uri " + + aNode.getUri() + " - attempting replacing..."); replaceNode(aNode, node); } else { nodeMap.put(nodeUri, node); @@ -89,7 +90,8 @@ public class RenderGraph { } if (graph.adjacentNodes(node).size() != 0) { - throw new RuntimeException("Node removal failure: node '" + nodeUri + "' is still connected to other nodes in the render graph!"); + throw new RuntimeException("Node removal failure: node '" + nodeUri + + "' is still connected to other nodes in the render graph!"); } nodeMap.remove(nodeUri); @@ -135,7 +137,8 @@ public class RenderGraph { } private void connect(Node... nodeList) { - Preconditions.checkArgument(nodeList.length > 1, "Expected at least 2 nodes as arguments to connect() - found " + nodeList.length); + Preconditions.checkArgument(nodeList.length > 1, + "Expected at least 2 nodes as arguments to connect() - found " + nodeList.length); Node fromNode = null; @@ -359,10 +362,12 @@ public class RenderGraph { } if (fromNode.addOutputRunOrderConnection(outputId)) { if (!toNode.addInputRunOrderConnection(fromNode.getOutputRunOrderConnection(outputId), inputId)) { - throw new RuntimeException("Could not add input RunOrder" + inputId + " connection to " + toNode + ". Connection probably already exists."); + throw new RuntimeException("Could not add input RunOrder" + inputId + " connection to " + toNode + + ". Connection probably already exists."); } } else { - throw new RuntimeException("Could not add output RunOrder" + outputId + " connection to " + fromNode + ". Connection probably already exists."); + throw new RuntimeException("Could not add output RunOrder" + outputId + " connection to " + fromNode + + ". Connection probably already exists."); } // if (!areConnected(fromNode, toNode)) { @@ -462,7 +467,8 @@ public class RenderGraph { reconnectInputToOutput(fromNode, outputId, toNode, inputId, ConnectionType.FBO, disconnectPrevious); } - public void reconnectInputFboToOutput(String fromNodeUri, int outputId, Node toNode, int inputId, boolean disconnectPrevious) { + public void reconnectInputFboToOutput(String fromNodeUri, int outputId, Node toNode, int inputId, + boolean disconnectPrevious) { Node fromNode = findNode(new SimpleUri(fromNodeUri)); if (fromNode == null) { fromNode = findAka(fromNodeUri); @@ -489,7 +495,8 @@ public class RenderGraph { }*/ } - public void reconnectInputBufferPairToOutput(String fromNodeUri, int outputId, Node toNode, int inputId, boolean disconnectPrevious) { + public void reconnectInputBufferPairToOutput(String fromNodeUri, int outputId, Node toNode, int inputId, + boolean disconnectPrevious) { Node fromNode = findNode(new SimpleUri(fromNodeUri)); if (fromNode == null) { fromNode = findAka(fromNodeUri); @@ -501,7 +508,8 @@ public class RenderGraph { reconnectInputToOutput(fromNodeUri, outputId, toNode, inputId, ConnectionType.BUFFER_PAIR, disconnectPrevious); } - public void reconnectInputToOutput(String fromNodeUri, int outputId, Node toNode, int inputId, ConnectionType connectionType, boolean disconnectPrevious) { + public void reconnectInputToOutput(String fromNodeUri, int outputId, Node toNode, int inputId, + ConnectionType connectionType, boolean disconnectPrevious) { Node fromNode = findNode(new SimpleUri(fromNodeUri)); if (fromNode == null) { fromNode = findAka(fromNodeUri); @@ -523,7 +531,8 @@ public class RenderGraph { * @param connectionType {@link ConnectionType} saying whether the dependency is Fbo, BufferPair or something else * @param disconnectPrevious TO DEPRECATE; Whether to disconnect previous connection. This should now be always true. */ - private void reconnectInputToOutput(Node toNode, int inputId, DependencyConnection fromConnection, ConnectionType connectionType, boolean disconnectPrevious) { + private void reconnectInputToOutput(Node toNode, int inputId, DependencyConnection fromConnection, + ConnectionType connectionType, boolean disconnectPrevious) { logger.debug("Attempting reconnection of " + toNode.getUri() + " to " + fromConnection.getParentNode() + "'s output."); Node fromNode; @@ -558,7 +567,8 @@ public class RenderGraph { // Save previous input connection source node to check whether if it's still depending on it after reconnect // should work like this, an input connection should have only one connected connection - DependencyConnection previousFromConnection = (DependencyConnection) connectionToReconnect.getConnectedConnections().values().iterator().next(); + DependencyConnection previousFromConnection = + (DependencyConnection) connectionToReconnect.getConnectedConnections().values().iterator().next(); Node previousFromNode = findNode((previousFromConnection).getParentNode()); connectionToReconnect.getConnectedConnections().clear(); @@ -567,7 +577,8 @@ public class RenderGraph { throw new RuntimeException("Node uri " + previousFromNode + " not found in renderGraph."); } - // Sets data and change toNode's connectedConnection to fromConnection. Sets previous fromConnection's connected node to null. + // Sets data and change toNode's connectedConnection to fromConnection. + // Sets previous fromConnection's connected node to null. connectionToReconnect.connectInputToOutput(fromConnection); // if not dependent on inputSourceConnection anymore, remove dag connection @@ -576,7 +587,8 @@ public class RenderGraph { //DISCONNECT in output connected connections previousFromConnection.getConnectedConnections().remove(connectionToReconnect.getName()); } - // setDependencies(this.context); - needed here? probably not..either do this after everything is set up, or in renderGraph.addNode + // setDependencies(this.context); - needed here? probably not.. + // either do this after everything is set up, or in renderGraph.addNode // and when calling these trough api, call resetDesiredStateChanges(); } else { logger.info(toNode + "'s connection " + connectionToReconnect + " was not connected. Attempting new connection..."); @@ -673,7 +685,8 @@ public class RenderGraph { * @param fromNode fromNode's SimpleUri name. Node must exist in the renderGraph. * @param outputId Id of fromNode's output. Output must exist. */ - public void reconnectInputToOutput(Node fromNode, int outputId, Node toNode, int inputId, ConnectionType connectionType, boolean disconnectPrevious) { + public void reconnectInputToOutput(Node fromNode, int outputId, Node toNode, int inputId, + ConnectionType connectionType, boolean disconnectPrevious) { // Would use of Preconditions be clearer? if (toNode == null || fromNode == null) { throw new RuntimeException("Reconnecting dependency failed. One of the nodes not found in the renderGraph." @@ -729,7 +742,8 @@ public class RenderGraph { DependencyConnection toConnection = connectedConnections.get(connectedConnectionCopy.getName()); if (!toConnection.getParentNode().equals(fromNode.getUri())) { // TODO potteintionally harmful ID guesswork - reconnectInputToOutput(findNode(toConnection.getParentNode()), DependencyConnection.getIdFromConnectionName(toConnection.getName()), + reconnectInputToOutput(findNode(toConnection.getParentNode()), + DependencyConnection.getIdFromConnectionName(toConnection.getName()), newOutputConnection, connectionType, true); // Node toNode = findNode(toConnection.getParentNode()); // if (!areConnected(fromNode, toNode)) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/DependencyConnection.java b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/DependencyConnection.java index 9e895b868..6d613bef3 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/DependencyConnection.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/DependencyConnection.java @@ -64,8 +64,9 @@ public abstract class DependencyConnection { } /** - * Setter for a DependencyConnection connection of DependencyConnection.connectedConnection. The idea is that when connecting a toNode's input to another - * fromNode's output, you set the OUTPUT connection's connectedConnection to the toNode's DependencyConnection which you connect. + * Setter for a DependencyConnection connection of DependencyConnection.connectedConnection. + * The idea is that when connecting a toNode's input to another fromNode's output, + * you set the OUTPUT connection's connectedConnection to the toNode's DependencyConnection which you connect. * @param connectedConnection A DependenyConnection connection of connected node. */ public void setConnectedConnection(DependencyConnection connectedConnection) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/ByteBufferAsset.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/ByteBufferAsset.java index f47e2bcf6..7dc506d99 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/ByteBufferAsset.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/ByteBufferAsset.java @@ -14,7 +14,8 @@ public class ByteBufferAsset extends Asset { private byte[] bytes; /** - * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load. + * The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, + * and an initial AssetData to load. * * @param urn The urn identifying the asset. * @param assetType The asset type this asset belongs to. diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFAttributeMapping.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFAttributeMapping.java index cdf12fb12..27a7ca325 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFAttributeMapping.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFAttributeMapping.java @@ -25,12 +25,14 @@ public final class GLTFAttributeMapping { } - public static void readVec3FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, VertexAttributeBinding mapping) { + public static void readVec3FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, + VertexAttributeBinding mapping) { if (accessor.getComponentType() != GLTFComponentType.FLOAT) { return; } - ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), bufferView.getByteLength() - accessor.getByteOffset()); + ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), + bufferView.getByteLength() - accessor.getByteOffset()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); int gap = 0; @@ -54,12 +56,14 @@ public final class GLTFAttributeMapping { } - public static void readVec2FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, VertexAttributeBinding mapping) { + public static void readVec2FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, + VertexAttributeBinding mapping) { if (accessor.getComponentType() != GLTFComponentType.FLOAT) { return; } - ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), bufferView.getByteLength() - accessor.getByteOffset()); + ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), + bufferView.getByteLength() - accessor.getByteOffset()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); int gap = 0; @@ -83,12 +87,14 @@ public final class GLTFAttributeMapping { } - public static void readVec4FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, VertexAttributeBinding mapping) { + public static void readVec4FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, + VertexAttributeBinding mapping) { if (accessor.getComponentType() != GLTFComponentType.FLOAT) { return; } - ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), bufferView.getByteLength() - accessor.getByteOffset()); + ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), + bufferView.getByteLength() - accessor.getByteOffset()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); int gap = 0; @@ -111,12 +117,14 @@ public final class GLTFAttributeMapping { } } - public static void readColor4FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, VertexAttributeBinding mapping) { + public static void readColor4FBuffer(byte[] buffer, GLTFAccessor accessor, GLTFBufferView bufferView, + VertexAttributeBinding mapping) { if (accessor.getComponentType() != GLTFComponentType.FLOAT) { return; } - ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), bufferView.getByteLength() - accessor.getByteOffset()); + ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), + bufferView.getByteLength() - accessor.getByteOffset()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); int gap = 0; 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 b8bb6c627..f8bcba2d8 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 @@ -90,7 +90,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.wrap(bytes, bufferView.getByteOffset(), + accessor.getCount() * accessor.getType().getDimension() * accessor.getComponentType().getByteLength()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); switch (accessor.getComponentType()) { case UNSIGNED_BYTE: @@ -161,14 +162,16 @@ public abstract class GLTFCommonFormat extends AbstractAsse uri = uri.substring(DATA_APPLICATION_OCTET_STREAM_BASE_64.length()); byte[] data = BaseEncoding.base64().decode(uri); if (data.length != buffer.getByteLength()) { - throw new IOException("Byte buffer " + uri + " has incorrect length. Expected (" + buffer.getByteLength() + "), actual (" + data.length + ")"); + throw new IOException("Byte buffer " + uri + " has incorrect length. " + + "Expected (" + buffer.getByteLength() + "), actual (" + data.length + ")"); } loadedBuffers.add(data); } else if (uri.startsWith(DATA_APPLICATION_GLTF_BUFFER_BASE_64)) { uri = uri.substring(DATA_APPLICATION_GLTF_BUFFER_BASE_64.length()); byte[] data = BaseEncoding.base64().decode(uri); if (data.length != buffer.getByteLength()) { - throw new IOException("Byte buffer " + uri + " has incorrect length. Expected (" + buffer.getByteLength() + "), actual (" + data.length + ")"); + throw new IOException("Byte buffer " + uri + " has incorrect length. " + + "Expected (" + buffer.getByteLength() + "), actual (" + data.length + ")"); } loadedBuffers.add(data); } else { @@ -211,7 +214,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return; } - ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), bufferView.getByteLength() - accessor.getByteOffset()); + ByteBuffer byteBuffer = ByteBuffer.wrap(buffer, bufferView.getByteOffset() + accessor.getByteOffset(), + bufferView.getByteLength() - accessor.getByteOffset()); byteBuffer.order(ByteOrder.LITTLE_ENDIAN); int gap = 0; @@ -313,7 +317,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return matricies; } - protected List loadVector4iList(MeshAttributeSemantic semantic, GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { + protected List loadVector4iList(MeshAttributeSemantic semantic, + GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { TIntList values = readIntBuffer(semantic, gltfPrimitive, gltf, loadedBuffers); List vectors = Lists.newArrayListWithCapacity(values.size() / 4); for (int i = 0; i < values.size(); i += 4) { @@ -322,7 +327,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return vectors; } - protected List loadVector2fList(MeshAttributeSemantic semantic, GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { + protected List loadVector2fList(MeshAttributeSemantic semantic, + GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { TFloatList floats = readFloatBuffer(semantic, gltfPrimitive, gltf, loadedBuffers); if (floats == null) { return Collections.emptyList(); @@ -335,7 +341,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return vectors; } - protected List loadVector3fList(MeshAttributeSemantic semantic, GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { + protected List loadVector3fList(MeshAttributeSemantic semantic, + GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { TFloatList floats = readFloatBuffer(semantic, gltfPrimitive, gltf, loadedBuffers); List vectors = Lists.newArrayListWithCapacity(floats.size() / 3); for (int i = 0; i < floats.size(); i += 3) { @@ -344,7 +351,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return vectors; } - protected List loadVector4fList(MeshAttributeSemantic semantic, GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { + protected List loadVector4fList(MeshAttributeSemantic semantic, + GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { TFloatList floats = readFloatBuffer(semantic, gltfPrimitive, gltf, loadedBuffers); List vectors = Lists.newArrayListWithCapacity(floats.size() / 4); for (int i = 0; i < floats.size(); i += 4) { @@ -353,7 +361,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return vectors; } - protected TFloatList readFloatBuffer(MeshAttributeSemantic semantic, GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { + protected TFloatList readFloatBuffer(MeshAttributeSemantic semantic, + GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { GLTFAccessor gltfAccessor = getAccessor(semantic, gltfPrimitive, gltf); if (gltfAccessor != null && gltfAccessor.getBufferView() != null) { GLTFBufferView bufferView = gltf.getBufferViews().get(gltfAccessor.getBufferView()); @@ -365,7 +374,8 @@ public abstract class GLTFCommonFormat extends AbstractAsse return new TFloatArrayList(); } - protected TIntList readIntBuffer(MeshAttributeSemantic semantic, GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { + protected TIntList readIntBuffer(MeshAttributeSemantic semantic, + GLTFPrimitive gltfPrimitive, GLTF gltf, List loadedBuffers) throws IOException { GLTFAccessor gltfAccessor = getAccessor(semantic, gltfPrimitive, gltf); if (gltfAccessor != null && gltfAccessor.getBufferView() != null) { GLTFBufferView bufferView = gltf.getBufferViews().get(gltfAccessor.getBufferView()); diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFMeshFormat.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFMeshFormat.java index b14ca734b..b63e674fc 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFMeshFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/GLTFMeshFormat.java @@ -71,19 +71,24 @@ public class GLTFMeshFormat extends GLTFCommonFormat { GLTFBufferView bufferView = gltf.getBufferViews().get(gltfAccessor.getBufferView()); switch (semantic) { case Position: - GLTFAttributeMapping.readVec3FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, bufferView, meshData.position); + GLTFAttributeMapping.readVec3FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, + bufferView, meshData.position); break; case Normal: - GLTFAttributeMapping.readVec3FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, bufferView, meshData.normal); + GLTFAttributeMapping.readVec3FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, + bufferView, meshData.normal); break; case Texcoord_0: - GLTFAttributeMapping.readVec2FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, bufferView, meshData.uv0); + GLTFAttributeMapping.readVec2FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, + bufferView, meshData.uv0); break; case Texcoord_1: - GLTFAttributeMapping.readVec2FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, bufferView, meshData.uv1); + GLTFAttributeMapping.readVec2FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, + bufferView, meshData.uv1); break; case Color_0: - GLTFAttributeMapping.readColor4FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, bufferView, meshData.color0); + GLTFAttributeMapping.readColor4FBuffer(loadedBuffers.get(bufferView.getBuffer()), gltfAccessor, + bufferView, meshData.color0); break; } } 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 6a6f82968..dcd088c9b 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 @@ -16,9 +16,12 @@ public enum MeshAttributeSemantic { Position("POSITION", GLTFAttributeType.VEC3, GLTFComponentType.FLOAT), Texcoord_0("TEXCOORD_0", GLTFAttributeType.VEC2, GLTFComponentType.FLOAT), Texcoord_1("TEXCOORD_1", GLTFAttributeType.VEC2, GLTFComponentType.FLOAT), - Color_0("COLOR_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, new GLTFComponentType[]{GLTFComponentType.FLOAT}), - Joints_0("JOINTS_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, new GLTFComponentType[]{GLTFComponentType.UNSIGNED_BYTE, GLTFComponentType.UNSIGNED_SHORT}), - Weights_0("WEIGHTS_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, new GLTFComponentType[]{GLTFComponentType.FLOAT}); + Color_0("COLOR_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, + new GLTFComponentType[]{GLTFComponentType.FLOAT}), + Joints_0("JOINTS_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, + new GLTFComponentType[]{GLTFComponentType.UNSIGNED_BYTE, GLTFComponentType.UNSIGNED_SHORT}), + Weights_0("WEIGHTS_0", new GLTFAttributeType[]{GLTFAttributeType.VEC4}, + new GLTFComponentType[]{GLTFComponentType.FLOAT}); private final String name; private final Set supportedAccessorTypes; 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 77b9bc81a..d960610e4 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 @@ -9,7 +9,9 @@ import javax.annotation.Nullable; /** * GLTFAccessor provides details on how to interpret a buffer view. *

- * See glTF Specification - accessor for details. + * 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 cf3cc8a76..434261c55 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 @@ -5,7 +5,9 @@ package org.terasology.engine.rendering.gltf.model; /** * GLTF Animation Sampler maps accessors with an algorithm to produce animation data. *

- * See glTF Specification - sampler for details. + * 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/GLTFBuffer.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFBuffer.java index f35598ee7..b03b992c2 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFBuffer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFBuffer.java @@ -3,7 +3,8 @@ package org.terasology.engine.rendering.gltf.model; /** - * Describes the location and length of a byte buffer. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-buffer for details + * Describes the location and length of a byte buffer. + * See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-buffer for details */ public class GLTFBuffer { private String uri = ""; diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannel.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannel.java index b1d8c9df8..424a1121f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannel.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFChannel.java @@ -3,7 +3,8 @@ package org.terasology.engine.rendering.gltf.model; /** - * GLTF Channel maps an animation sampler to a node value to animate. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#channel for details + * GLTF Channel maps an animation sampler to a node value to animate. + * See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#channel for details */ public class GLTFChannel { private int sampler; 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 0abda7bff..effac964b 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 @@ -5,14 +5,17 @@ package org.terasology.engine.rendering.gltf.model; /** * GLTF Channel Target is the details of what to animate with a GLTF Channel. *

- * See glTF Specification - target for details. + * See + * glTF Specification - target + * for details. */ public class GLTFChannelTarget { private Integer node; private GLTFChannelPath path; /** - * @return The index of the node to animate. Apparently optional, I don't know what it means if it is missing (maybe just for mesh with a single node?) + * @return The index of the node to animate. + * Apparently optional, I don't know what it means if it is missing (maybe just for mesh with a single node?) */ public Integer getNode() { return node; diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFMesh.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFMesh.java index 762f7dfea..1759b0c55 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFMesh.java @@ -9,7 +9,8 @@ import javax.annotation.Nullable; import java.util.List; /** - * A glTF mesh is composed of one or more primitives. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-mesh for details. + * A glTF mesh is composed of one or more primitives. + * See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-mesh for details. */ public class GLTFMesh { private List primitives = Lists.newArrayList(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFScene.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFScene.java index 1060ca9ee..7c383eca5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFScene.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFScene.java @@ -8,7 +8,8 @@ import gnu.trove.list.array.TIntArrayList; import javax.annotation.Nullable; /** - * Describes a scene composed of glTF nodes. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-scene for details. + * Describes a scene composed of glTF nodes. + * See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-scene for details. */ public class GLTFScene { private String name = ""; diff --git a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSkin.java b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSkin.java index d404e38f2..51dab8324 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSkin.java +++ b/engine/src/main/java/org/terasology/engine/rendering/gltf/model/GLTFSkin.java @@ -6,7 +6,8 @@ import gnu.trove.list.TIntList; import gnu.trove.list.array.TIntArrayList; /** - * GLTFSSkin defines the joints and matrices of a skeleton. See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-skin for details + * GLTFSSkin defines the joints and matrices of a skeleton. + * See https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#reference-skin for details */ public class GLTFSkin { private Integer inverseBindMatrices; @@ -15,7 +16,8 @@ public class GLTFSkin { private String name = ""; /** - * @return The index of an accessor containing 4x4 floating point inverseBind matrices. If null, then each matrix can be considered to be an identity matrix. + * @return The index of an accessor containing 4x4 floating point inverseBind matrices. + * If null, then each matrix can be considered to be an identity matrix. */ public Integer getInverseBindMatrices() { return inverseBindMatrices; 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 b4f1b82aa..6453d0f86 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 @@ -5,7 +5,9 @@ package org.terasology.engine.rendering.gltf.model; /** * GLTFSparse provides sparse storage of overrides for attributes. *

- * See glTF Specification - sparse for details. + * 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 719158341..c84927969 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 @@ -58,7 +58,9 @@ public class IconMeshDataProducer implements AssetDataProducer { @Override public Optional getAssetData(ResourceUrn urn) throws IOException { if (ICON_DISCRIMINATOR.equals(urn.getResourceName())) { - ResourceUrn textureUrn = new ResourceUrn(urn.getModuleName().toString() + ResourceUrn.RESOURCE_SEPARATOR + urn.getFragmentName().toString()); + ResourceUrn textureUrn = new ResourceUrn(urn.getModuleName().toString() + + ResourceUrn.RESOURCE_SEPARATOR + + urn.getFragmentName().toString()); Optional textureRegionAsset = assetManager.getAsset(textureUrn, TextureRegionAsset.class); if (textureRegionAsset.isPresent() && !textureRegionAsset.get().getTexture().isDisposed()) { return Optional.of(IconMeshFactory.generateIconMeshData(textureRegionAsset.get())); diff --git a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java index 1e7b57d98..c231435a8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java +++ b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java @@ -27,10 +27,12 @@ public final class IconMeshFactory { if (region instanceof Asset) { ResourceUrn urn = ((Asset) region).getUrn(); if (urn.getFragmentName().isEmpty()) { - return Assets.get(new ResourceUrn(urn.getModuleName(), IconMeshDataProducer.ICON_DISCRIMINATOR, urn.getResourceName()), Mesh.class).get(); + return Assets.get(new ResourceUrn(urn.getModuleName(), IconMeshDataProducer.ICON_DISCRIMINATOR, + urn.getResourceName()), Mesh.class).get(); } else { Name fragName = new Name(urn.getResourceName().toString() + ResourceUrn.FRAGMENT_SEPARATOR + urn.getFragmentName().toString()); - return Assets.get(new ResourceUrn(urn.getModuleName(), IconMeshDataProducer.ICON_DISCRIMINATOR, fragName), Mesh.class).get(); + return Assets.get(new ResourceUrn(urn.getModuleName(), IconMeshDataProducer.ICON_DISCRIMINATOR, + fragName), Mesh.class).get(); } } else { return generateIconMesh(region); @@ -127,8 +129,11 @@ public final class IconMeshFactory { } if (newA < alphaLimit) { - Vector4f cColor = new Vector4f(colorContour.x / 255f, colorContour.y / 255f, colorContour.z / 255f, colorContour.w); - TessellatorHelper.addBlockMesh(tessellator, cColor, 0.125f, 1.0f, 0.5f, 2f * 0.0625f * newX - 0.5f, 0.125f * (15 - newY) - 1f, 0f); + Vector4f cColor = new Vector4f(colorContour.x / 255f, + colorContour.y / 255f, + colorContour.z / 255f, colorContour.w); + TessellatorHelper.addBlockMesh(tessellator, cColor, 0.125f, 1.0f, 0.5f, + 2f * 0.0625f * newX - 0.5f, 0.125f * (15 - newY) - 1f, 0f); } } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/LightComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/LightComponent.java index c621d900a..c93f9adb3 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/LightComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/LightComponent.java @@ -8,7 +8,8 @@ import org.terasology.engine.network.ReplicationCheck; import org.terasology.reflection.metadata.FieldMetadata; /** - * Add this component to an entity for it to transmit light from its location. By default the component is configured to act similarly to a placed torch block. + * Add this component to an entity for it to transmit light from its location. + * By default the component is configured to act similarly to a placed torch block. */ // TODO: Split into multiple components? Point, Directional? public final class LightComponent implements VisualComponent, ReplicationCheck { @@ -29,12 +30,15 @@ public final class LightComponent implements VisualComponent, ReplicationCheck { public float lightAmbientIntensity = 1.0f; /** - * This helps control how focused the specular light is. A smaller number will make a wider cone of light. A larger number will make a narrower cone of light. + * This helps control how focused the specular light is. + * A smaller number will make a wider cone of light. + * A larger number will make a narrower cone of light. */ @Replicate public float lightSpecularPower = 80.0f; /** - * Light attenuation range used in the calculation of how light fades from the light source as it gets farther away. It is use in the following calculation: + * Light attenuation range used in the calculation of how light fades from the light source as it gets farther away. + * It is use in the following calculation: *

* attenuation = 1 / (lightDist/lightAttenuationRange + 1)^2 *

diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/MeshRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/logic/MeshRenderer.java index 0a1a6216f..71a73dbf7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/MeshRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/MeshRenderer.java @@ -36,7 +36,8 @@ import java.util.Arrays; import java.util.Set; /** - * TODO: This should be made generic (no explicit shader or mesh) and ported directly into WorldRenderer? Later note: some GelCube functionality moved to a module + * TODO: This should be made generic (no explicit shader or mesh) and ported directly into WorldRenderer? + * Later note: some GelCube functionality moved to a module */ @RegisterSystem(RegisterMode.CLIENT) public class MeshRenderer extends BaseComponentSystem implements RenderSystem { @@ -194,7 +195,8 @@ public class MeshRenderer extends BaseComponentSystem implements RenderSystem { matrixCameraSpace.translationRotateScale(offsetFromCamera, worldRot, worldScale); - AABBf aabb = meshComp.mesh.getAABB().transform(new Matrix4f().translationRotateScale(worldPos, worldRot, worldScale), new AABBf()); + AABBf aabb = meshComp.mesh.getAABB() + .transform(new Matrix4f().translationRotateScale(worldPos, worldRot, worldScale), new AABBf()); if (worldRenderer.getActiveCamera().hasInSight(aabb)) { modelViewMatrix.set(worldRenderer.getActiveCamera().getViewMatrix()).mul(matrixCameraSpace); modelViewMatrix.get(tempMatrixBuffer44); @@ -206,7 +208,8 @@ public class MeshRenderer extends BaseComponentSystem implements RenderSystem { material.setFloat3("colorOffset", meshComp.color.rf(), meshComp.color.gf(), meshComp.color.bf(), true); material.setFloat("sunlight", worldRenderer.getMainLightIntensityAt(worldPos), true); - material.setFloat("blockLight", Math.max(worldRenderer.getBlockLightIntensityAt(worldPos), meshComp.selfLuminance), true); + material.setFloat("blockLight", + Math.max(worldRenderer.getBlockLightIntensityAt(worldPos), meshComp.selfLuminance), true); meshComp.mesh.render(); } 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 046b0329a..59e003178 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 @@ -185,7 +185,8 @@ public class SkeletonRenderer extends BaseComponentSystem implements RenderSyste return animationPool.get(random.nextInt(animationPool.size())); } - private void updateSkeleton(SkeletalMeshComponent skeletalMeshComp, MeshAnimationFrame frameA, MeshAnimationFrame frameB, float interpolationVal) { + private void updateSkeleton(SkeletalMeshComponent skeletalMeshComp, MeshAnimationFrame frameA, MeshAnimationFrame frameB, + float interpolationVal) { for (int i = 0; i < skeletalMeshComp.animation.getBoneCount(); ++i) { String boneName = skeletalMeshComp.animation.getBoneName(i); Bone bone = skeletalMeshComp.mesh.getBone(boneName); @@ -220,7 +221,10 @@ public class SkeletonRenderer extends BaseComponentSystem implements RenderSyste for (EntityRef entity : entityManager.getEntitiesWith(SkeletalMeshComponent.class, LocationComponent.class)) { SkeletalMeshComponent skeletalMesh = entity.getComponent(SkeletalMeshComponent.class); - if (skeletalMesh.mesh == null || skeletalMesh.material == null || skeletalMesh.boneEntities == null || !skeletalMesh.material.isRenderable()) { + if (skeletalMesh.mesh == null + || skeletalMesh.material == null + || skeletalMesh.boneEntities == null + || !skeletalMesh.material.isRenderable()) { continue; } AABBf aabb; @@ -253,7 +257,8 @@ public class SkeletonRenderer extends BaseComponentSystem implements RenderSyste skeletalMesh.material.enable(); skeletalMesh.material.setFloat("sunlight", 1.0f, true); skeletalMesh.material.setFloat("blockLight", 1.0f, true); - skeletalMesh.material.setFloat3("colorOffset", skeletalMesh.color.rf(), skeletalMesh.color.gf(), skeletalMesh.color.bf(), true); + skeletalMesh.material.setFloat3("colorOffset", skeletalMesh.color.rf(), + skeletalMesh.color.gf(), skeletalMesh.color.bf(), true); skeletalMesh.material.setMatrix4("projectionMatrix", worldRenderer.getActiveCamera().getProjectionMatrix()); skeletalMesh.material.bindTextures(); @@ -325,7 +330,8 @@ public class SkeletonRenderer extends BaseComponentSystem implements RenderSyste Vector3f worldPositionCameraSpace = new Vector3f(); worldPositionCameraSpace.sub(worldPos, cameraPosition); - Matrix4f matrixCameraSpace = new Matrix4f().translation(worldPositionCameraSpace); //anew Quat4f(0, 0, 0, 1), worldPositionCameraSpace, 1); + //anew Quat4f(0, 0, 0, 1), worldPositionCameraSpace, 1); + Matrix4f matrixCameraSpace = new Matrix4f().translation(worldPositionCameraSpace); Matrix4f modelViewMatrix = worldRenderer.getActiveCamera().getViewMatrix().mul(matrixCameraSpace, new Matrix4f()); modelViewMatrix.get(tempMatrixBuffer44); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/CanvasUtility.java b/engine/src/main/java/org/terasology/engine/rendering/nui/CanvasUtility.java index 80bd9365f..6ee92966a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/CanvasUtility.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/CanvasUtility.java @@ -23,7 +23,8 @@ public final class CanvasUtility { private CanvasUtility() { } - public static void drawMesh(Canvas canvas, Mesh mesh, Texture texture, Rectanglei region, Quaternionfc rotation, Vector3fc offset, float scale) { + public static void drawMesh(Canvas canvas, Mesh mesh, Texture texture, Rectanglei region, Quaternionfc rotation, + Vector3fc offset, float scale) { // TODO: Find a way to abstractly implement drawMesh in NUI if (!(canvas instanceof TerasologyCanvasImpl)) { @@ -33,7 +34,8 @@ public final class CanvasUtility { ((TerasologyCanvasImpl) canvas).drawMesh(mesh, texture, region, rotation, offset, scale); } - public static void drawMesh(Canvas canvas, Mesh mesh, Material material, Rectanglei region, Quaternionfc rotation, Vector3fc offset, float scale) { + public static void drawMesh(Canvas canvas, Mesh mesh, Material material, Rectanglei region, Quaternionfc rotation, + Vector3fc offset, float scale) { // TODO: Find a way to abstractly implement drawMesh in NUI if (!(canvas instanceof TerasologyCanvasImpl)) { 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 827c5dccf..72ca47ce5 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 @@ -15,7 +15,8 @@ import org.terasology.engine.rendering.assets.mesh.Mesh; public interface TerasologyCanvasRenderer extends CanvasRenderer { FrameBufferObject getFBO(ResourceUrn urn, Vector2ic size); - void drawMesh(Mesh mesh, Material material, Rectanglei drawRegion, Rectanglei cropRegion, Quaternionfc rotation, Vector3fc offset, float scale, float alpha); + void drawMesh(Mesh mesh, Material material, Rectanglei drawRegion, Rectanglei cropRegion, + Quaternionfc rotation, Vector3fc offset, float scale, float alpha); void drawMaterialAt(Material material, Rectanglei drawRegion); } 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 bcb1d0682..e4ef8e5e3 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 @@ -25,12 +25,14 @@ public class WidgetMetadata extends ClassMetadata type, ReflectFactory factory, CopyStrategyLibrary copyStrategyLibrary) throws NoSuchMethodException { + public WidgetMetadata(ResourceUrn uri, Class type, ReflectFactory factory, CopyStrategyLibrary copyStrategyLibrary) + throws NoSuchMethodException { super(uri.toString(), type, factory, copyStrategyLibrary, IsConfigField.INSTANCE); } @Override - protected FieldMetadata createField(Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory) throws InaccessibleFieldException { + protected FieldMetadata createField(Field field, CopyStrategyLibrary copyStrategyLibrary, ReflectFactory factory) + throws InaccessibleFieldException { return new FieldMetadata<>(this, field, copyStrategyLibrary, factory); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugOverlay.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugOverlay.java index 4daf4285f..17c4c8497 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugOverlay.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugOverlay.java @@ -133,7 +133,8 @@ public class DebugOverlay extends CoreScreenLayer { orientation = "NW"; break; } - return String.format(Locale.US, "Position: (%.2f, %.2f, %.2f), Chunk (%d, %d, %d), Eye (%.2f, %.2f, %.2f), Rot (%.2f, %.2f, %.2f) %s", pos.x, pos.y, pos.z, + return String.format(Locale.US, "Position: (%.2f, %.2f, %.2f), Chunk (%d, %d, %d), " + + "Eye (%.2f, %.2f, %.2f), Rot (%.2f, %.2f, %.2f) %s", pos.x, pos.y, pos.z, chunkPos.x, chunkPos.y, chunkPos.z, cameraPos.x, cameraPos.y, cameraPos.z, rotation.x, rotation.y, rotation.z, orientation); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/FilePickerPopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/FilePickerPopup.java index 9b553a696..9218b8d15 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/FilePickerPopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/FilePickerPopup.java @@ -66,7 +66,9 @@ public class FilePickerPopup extends CoreScreenLayer { find("currentPath", UILabel.class).bindText(new ReadOnlyBinding() { @Override public String get() { - return currentPath == null ? translationSystem.translate("${engine:menu#file-picker-roots-title}") : pathToString(currentPath, false); + return currentPath == null + ? translationSystem.translate("${engine:menu#file-picker-roots-title}") + : pathToString(currentPath, false); } }); find("fileName", UIText.class).bindText(new Binding() { @@ -188,6 +190,8 @@ public class FilePickerPopup extends CoreScreenLayer { } private void showDirectoryAccessErrorMessage(String message) { - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage(translationSystem.translate("${engine:menu#file-picker-cant-change-dir}"), message); + getManager() + .pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage(translationSystem.translate("${engine:menu#file-picker-cant-change-dir}"), message); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/LaunchPopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/LaunchPopup.java index f50a16553..a72b08921 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/LaunchPopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/LaunchPopup.java @@ -29,7 +29,8 @@ public class LaunchPopup extends CoreScreenLayer { @Override public void initialise() { - WidgetUtil.tryBindCheckbox(this, "showLaunchPopup", BindHelper.bindBeanProperty("launchPopupDisabled", config.getTelemetryConfig(), Boolean.TYPE)); + WidgetUtil.tryBindCheckbox(this, "showLaunchPopup", + BindHelper.bindBeanProperty("launchPopupDisabled", config.getTelemetryConfig(), Boolean.TYPE)); WidgetUtil.trySubscribe(this, "yes", (button) -> { yesHandler.run(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NameRecordingScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NameRecordingScreen.java index a84a5e1b2..2610c5b1c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NameRecordingScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NameRecordingScreen.java @@ -102,7 +102,8 @@ public class NameRecordingScreen extends CoreScreenLayer { } /** - * Last step of the recording setup process. Copies the save files from the selected game, transplants them into the 'recordings' folder, and renames the map files + * Last step of the recording setup process. + * Copies the save files from the selected game, transplants them into the 'recordings' folder, and renames the map files * to match the provided recording name. Then launches the game loading state. * * @param newTitle The title of the new recording. @@ -163,7 +164,8 @@ public class NameRecordingScreen extends CoreScreenLayer { private boolean isNameValid(String name) { Path destinationPath = PathManager.getInstance().getRecordingPath(name); - // invalid characters are filtered from paths, so if the file name is made up of entirely invalid characters, the path will have a blank file name. + // invalid characters are filtered from paths + // - if the file name is made up of entirely invalid characters, the path will have a blank file name. // also acts as a check for blank input. return !destinationPath.equals(PathManager.getInstance().getRecordingPath("")); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectionScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectionScreen.java index 08702405e..57cdc8f9a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectionScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectionScreen.java @@ -87,7 +87,10 @@ public abstract class SelectionScreen extends CoreScreenLayer { if (wgi != null) { mainWorldGenerator = wgi.getDisplayName(); } else { - mainWorldGenerator = mainWorldGenerator + gameInfo.getManifest().getWorldInfo(TerasologyConstants.MAIN_WORLD).getWorldGenerator().toString() + " not found"; + mainWorldGenerator = mainWorldGenerator + gameInfo.getManifest() + .getWorldInfo(TerasologyConstants.MAIN_WORLD) + .getWorldGenerator() + .toString() + " not found"; } final String commaSeparatedModules = gameInfo.getManifest() @@ -99,7 +102,9 @@ public abstract class SelectionScreen extends CoreScreenLayer { .collect(Collectors.joining(", ")); worldGenerator.setText(mainWorldGenerator); - moduleNames.setText(commaSeparatedModules.length() > MODULES_LINE_LIMIT ? commaSeparatedModules.substring(0, MODULES_LINE_LIMIT) + "..." : commaSeparatedModules); + moduleNames.setText(commaSeparatedModules.length() > MODULES_LINE_LIMIT + ? commaSeparatedModules.substring(0, MODULES_LINE_LIMIT) + "..." + : commaSeparatedModules); loadPreviewImages(gameInfo); } @@ -118,7 +123,8 @@ public abstract class SelectionScreen extends CoreScreenLayer { logger.error("Converting preview image to texture data {} failed", e); return null; } - return Assets.generateAsset(new ResourceUrn(PREVIEW_IMAGE_URI_PATTERN + bufferedImages.indexOf(buffImage)), textureData, Texture.class); + return Assets.generateAsset(new ResourceUrn(PREVIEW_IMAGE_URI_PATTERN + bufferedImages.indexOf(buffImage)), + textureData, Texture.class); }) .filter(Objects::nonNull) .collect(Collectors.toList()); @@ -145,7 +151,8 @@ public abstract class SelectionScreen extends CoreScreenLayer { gameList.select(0); } catch (Exception e) { logger.error("Failed to delete " + removeString, e); - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Deleting Game", e.getMessage()); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Error Deleting Game", e.getMessage()); } } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/StartPlayingScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/StartPlayingScreen.java index 5cdc4cd9c..b31b6b71a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/StartPlayingScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/StartPlayingScreen.java @@ -63,7 +63,9 @@ public class StartPlayingScreen extends CoreScreenLayer { universeWrapper.setTargetWorld(targetWorld); final GameManifest gameManifest = GameManifestProvider.createGameManifest(universeWrapper, moduleManager, config); if (gameManifest != null) { - gameEngine.changeState(new StateLoading(gameManifest, (universeWrapper.getLoadingAsServer()) ? NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); + gameEngine.changeState(new StateLoading(gameManifest, (universeWrapper.getLoadingAsServer()) + ? NetworkMode.DEDICATED_SERVER + : NetworkMode.NONE)); } else { getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error", "Can't create new game!"); } @@ -76,15 +78,17 @@ public class StartPlayingScreen extends CoreScreenLayer { if (world != targetWorld) { i++; uri = world.getWorldGeneratorInfo().getUri(); - worldInfo = new WorldInfo(TerasologyConstants.MAIN_WORLD + i, world.getWorldName().toString(), world.getWorldGenerator().getWorldSeed(), - (long) (WorldTime.DAY_LENGTH * WorldTime.NOON_OFFSET), uri); + worldInfo = new WorldInfo(TerasologyConstants.MAIN_WORLD + i, world.getWorldName().toString(), + world.getWorldGenerator().getWorldSeed(), (long) (WorldTime.DAY_LENGTH * WorldTime.NOON_OFFSET), uri); gameManifest.addWorld(worldInfo); config.getUniverseConfig().addWorldManager(worldInfo); } } - gameEngine.changeState(new StateLoading(gameManifest, (universeWrapper.getLoadingAsServer()) ? NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); + gameEngine.changeState(new StateLoading(gameManifest, (universeWrapper.getLoadingAsServer()) + ? NetworkMode.DEDICATED_SERVER + : NetworkMode.NONE)); }); WidgetUtil.trySubscribe(this, "mainMenu", button -> { @@ -92,9 +96,11 @@ public class StartPlayingScreen extends CoreScreenLayer { }); WidgetUtil.trySubscribe(this, "renderingSettings", button -> { - RenderingModuleSettingScreen renderingModuleSettingScreen = (RenderingModuleSettingScreen) getManager().getScreen(RenderingModuleSettingScreen.ASSET_URI); + RenderingModuleSettingScreen renderingModuleSettingScreen = (RenderingModuleSettingScreen) getManager() + .getScreen(RenderingModuleSettingScreen.ASSET_URI); if (renderingModuleSettingScreen == null) { - renderingModuleSettingScreen = getManager().createScreen(RenderingModuleSettingScreen.ASSET_URI, RenderingModuleSettingScreen.class); + renderingModuleSettingScreen = getManager() + .createScreen(RenderingModuleSettingScreen.ASSET_URI, RenderingModuleSettingScreen.class); renderingModuleSettingScreen.setSubContext(this.subContext); renderingModuleSettingScreen.postInit(); } @@ -119,7 +125,8 @@ public class StartPlayingScreen extends CoreScreenLayer { * @param worldSetupWrapperList The world in which the player is going to spawn. * @param targetWorldTexture The world texture generated in {@link WorldPreGenerationScreen} to be displayed on this screen. */ - public void setTargetWorld(List worldSetupWrapperList, WorldSetupWrapper spawnWorld, Texture targetWorldTexture, Context context) { + public void setTargetWorld(List worldSetupWrapperList, WorldSetupWrapper spawnWorld, + Texture targetWorldTexture, Context context) { texture = targetWorldTexture; worldSetupWrappers = worldSetupWrapperList; universeWrapper = context.get(UniverseWrapper.class); 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 0837b1f2b..9d6ec26d2 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 @@ -173,7 +173,8 @@ public class UniverseSetupScreen extends CoreScreenLayer { worldSetupScreen.setWorld(context, findWorldByName(), worldsDropdown); triggerForwardAnimation(worldSetupScreen); } else { - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Worlds List Empty!", "No world found to configure."); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Worlds List Empty!", "No world found to configure."); } } catch (UnresolvedWorldGeneratorException e) { logger.error("Can't configure the world! due to {}", e.getMessage()); @@ -184,8 +185,9 @@ public class UniverseSetupScreen extends CoreScreenLayer { //TODO: there should not be a reference from the engine to some module - the engine must be agnostic to what // modules may do if (worldGenerator.getSelection().getUri().toString().equals("CoreWorlds:heightMap")) { - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage( - "HeightMap not supported", "HeightMap is not supported for advanced setup right now, a game template will be introduced soon."); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("HeightMap not supported", + "HeightMap is not supported for advanced setup right now, a game template will be introduced soon."); } else { addNewWorld(worldGenerator.getSelection()); worldsDropdown.setOptions(worldNames()); @@ -193,7 +195,8 @@ public class UniverseSetupScreen extends CoreScreenLayer { }); WidgetUtil.trySubscribe(this, "continue", button -> { - final WorldPreGenerationScreen worldPreGenerationScreen = getManager().createScreen(WorldPreGenerationScreen.ASSET_URI, WorldPreGenerationScreen.class); + final WorldPreGenerationScreen worldPreGenerationScreen = + getManager().createScreen(WorldPreGenerationScreen.ASSET_URI, WorldPreGenerationScreen.class); if (!worlds.isEmpty()) { final WaitPopup loadPopup = getManager().pushScreen(WaitPopup.ASSET_URI, WaitPopup.class); loadPopup.setMessage("Loading", "please wait ..."); @@ -201,7 +204,8 @@ public class UniverseSetupScreen extends CoreScreenLayer { if (result != null && result) { triggerForwardAnimation(worldPreGenerationScreen); } else { - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error", "Can't load world pre generation screen! Please, try again!"); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Error", "Can't load world pre generation screen! Please, try again!"); } }); loadPopup.startOperation(() -> { @@ -213,8 +217,8 @@ public class UniverseSetupScreen extends CoreScreenLayer { return true; }, true); } else { - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage( - "Worlds List Empty!", "Please select a world generator and add words to the dropdown!"); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Worlds List Empty!", "Please select a world generator and add words to the dropdown!"); } }); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java index e15f1e7c3..c5c5bc3e0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java @@ -124,7 +124,8 @@ public class WorldPreGenerationScreen extends CoreScreenLayer implements UISlide selectedWorld = value; try { if (findWorldByName(selectedWorld).getWorldGenerator() == null) { - worldGenerator = WorldGeneratorManager.createWorldGenerator(findWorldByName(selectedWorld).getWorldGeneratorInfo().getUri(), context, environment); + worldGenerator = WorldGeneratorManager.createWorldGenerator(findWorldByName(selectedWorld) + .getWorldGeneratorInfo().getUri(), context, environment); findWorldByName(selectedWorld).setWorldGenerator(worldGenerator); } else { worldGenerator = findWorldByName(selectedWorld).getWorldGenerator(); @@ -158,7 +159,8 @@ public class WorldPreGenerationScreen extends CoreScreenLayer implements UISlide worldSetupScreen.setWorld(context, findWorldByName(selectedWorld), worldsDropdown); triggerForwardAnimation(worldSetupScreen); } else { - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Worlds List Empty!", "No world found to configure."); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Worlds List Empty!", "No world found to configure."); } } catch (UnresolvedWorldGeneratorException e) { e.printStackTrace(); @@ -166,7 +168,8 @@ public class WorldPreGenerationScreen extends CoreScreenLayer implements UISlide }); WidgetUtil.trySubscribe(this, "close", button -> { - final UniverseSetupScreen universeSetupScreen = getManager().createScreen(UniverseSetupScreen.ASSET_URI, UniverseSetupScreen.class); + final UniverseSetupScreen universeSetupScreen = + getManager().createScreen(UniverseSetupScreen.ASSET_URI, UniverseSetupScreen.class); UIDropdownScrollable worldsDropdownOfUniverse = universeSetupScreen.find("worlds", UIDropdownScrollable.class); universeSetupScreen.refreshWorldDropdown(worldsDropdownOfUniverse); triggerBackAnimation(); @@ -183,7 +186,8 @@ public class WorldPreGenerationScreen extends CoreScreenLayer implements UISlide try { if (findWorldByName(selectedWorld).getWorldGenerator() == null) { - worldGenerator = WorldGeneratorManager.createWorldGenerator(findWorldByName(selectedWorld).getWorldGeneratorInfo().getUri(), context, environment); + worldGenerator = WorldGeneratorManager.createWorldGenerator(findWorldByName(selectedWorld) + .getWorldGeneratorInfo().getUri(), context, environment); findWorldByName(selectedWorld).setWorldGenerator(worldGenerator); } else { worldGenerator = findWorldByName(selectedWorld).getWorldGenerator(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldSetupScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldSetupScreen.java index 12138cc11..1065d9f48 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldSetupScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldSetupScreen.java @@ -67,8 +67,10 @@ public class WorldSetupScreen extends CoreScreenLayer { setAnimationSystem(MenuAnimationSystems.createDefaultSwipeAnimation()); WidgetUtil.trySubscribe(this, "close", button -> { - final UniverseSetupScreen universeSetupScreen = getManager().createScreen(UniverseSetupScreen.ASSET_URI, UniverseSetupScreen.class); - final WorldPreGenerationScreen worldPreGenerationScreen = getManager().createScreen(WorldPreGenerationScreen.ASSET_URI, WorldPreGenerationScreen.class); + final UniverseSetupScreen universeSetupScreen = + getManager().createScreen(UniverseSetupScreen.ASSET_URI, UniverseSetupScreen.class); + final WorldPreGenerationScreen worldPreGenerationScreen = + getManager().createScreen(WorldPreGenerationScreen.ASSET_URI, WorldPreGenerationScreen.class); UIText customWorldName = find("customisedWorldName", UIText.class); boolean goBack = false; @@ -76,13 +78,15 @@ public class WorldSetupScreen extends CoreScreenLayer { //sanity checks on world name if (customWorldName.getText().isEmpty()) { //name empty: display a popup, stay on the same screen - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Name Cannot Be Empty!", "Please add a name for the world"); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Name Cannot Be Empty!", "Please add a name for the world"); } else if (customWorldName.getText().equalsIgnoreCase(world.getWorldName().toString())) { //same name as before: go back to universe setup goBack = true; } else if (universeSetupScreen.worldNameMatchesAnother(customWorldName.getText())) { //if same name is already used, inform user with a popup - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Name Already Used!", "Please use a different name for this world"); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Name Already Used!", "Please use a different name for this world"); } else { //no match found: go back to universe setup goBack = true; @@ -125,7 +129,8 @@ public class WorldSetupScreen extends CoreScreenLayer { * @param worldSelected the world whose configurations are to be changed. * @throws UnresolvedWorldGeneratorException */ - public void setWorld(Context subContext, WorldSetupWrapper worldSelected, UIDropdownScrollable dropDown) throws UnresolvedWorldGeneratorException { + public void setWorld(Context subContext, WorldSetupWrapper worldSelected, UIDropdownScrollable dropDown) + throws UnresolvedWorldGeneratorException { world = worldSelected; context = subContext; worldsDropdown = dropDown; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/advancedGameSetupScreen/AdvancedGameSetupScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/advancedGameSetupScreen/AdvancedGameSetupScreen.java index 04847b2e4..e7b58fcbb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/advancedGameSetupScreen/AdvancedGameSetupScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/advancedGameSetupScreen/AdvancedGameSetupScreen.java @@ -472,7 +472,8 @@ public class AdvancedGameSetupScreen extends CoreScreenLayer { } }); moduleDetails.subscribe(b -> { - final ModuleDetailsScreen moduleDetailsScreen = getManager().createScreen(ModuleDetailsScreen.ASSET_URI, ModuleDetailsScreen.class); + final ModuleDetailsScreen moduleDetailsScreen = getManager() + .createScreen(ModuleDetailsScreen.ASSET_URI, ModuleDetailsScreen.class); final Collection modules = sortedModules.stream() .map(ModuleSelectionInfo::getMetadata) .filter(Objects::nonNull) @@ -495,7 +496,8 @@ public class AdvancedGameSetupScreen extends CoreScreenLayer { } WidgetUtil.trySubscribe(this, "createWorld", button -> { - final UniverseSetupScreen universeSetupScreen = getManager().createScreen(UniverseSetupScreen.ASSET_URI, UniverseSetupScreen.class); + final UniverseSetupScreen universeSetupScreen = getManager() + .createScreen(UniverseSetupScreen.ASSET_URI, UniverseSetupScreen.class); universeWrapper.setSeed(seed.getText()); saveConfiguration(); universeSetupScreen.setEnvironment(universeWrapper); @@ -504,15 +506,18 @@ public class AdvancedGameSetupScreen extends CoreScreenLayer { WidgetUtil.trySubscribe(this, "play", button -> { if (StringUtils.isBlank(seed.getText())) { - getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error", "Game seed cannot be empty!"); + getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class). + setMessage("Error", "Game seed cannot be empty!"); } else { universeWrapper.setSeed(seed.getText()); saveConfiguration(); final GameManifest gameManifest = GameManifestProvider.createGameManifest(universeWrapper, moduleManager, config); if (gameManifest != null) { - gameEngine.changeState(new StateLoading(gameManifest, (universeWrapper.getLoadingAsServer()) ? NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); + gameEngine.changeState(new StateLoading(gameManifest, + (universeWrapper.getLoadingAsServer()) ? NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); } else { - getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error", "Can't create new game!"); + getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class) + .setMessage("Error", "Can't create new game!"); } } }); @@ -608,7 +613,8 @@ public class AdvancedGameSetupScreen extends CoreScreenLayer { private void filterText() { String newText = moduleSearch.getText(); - sortedModules.removeIf(moduleSelectionInfo -> !moduleSelectionInfo.getMetadata().getDisplayName().toString().toLowerCase().contains(newText.toLowerCase())); + sortedModules.removeIf(moduleSelectionInfo -> !moduleSelectionInfo.getMetadata() + .getDisplayName().toString().toLowerCase().contains(newText.toLowerCase())); } private void startDownloadingNewestModulesRequiredFor(ModuleSelectionInfo moduleMetadata) { 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 1fc4e96ab..eaa2596fa 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 @@ -369,7 +369,8 @@ public class GameDetailsScreen extends CoreScreenLayer { module = moduleManager.getRegistry().getLatestModuleVersion(nameVersion.getName()); if (module != null) { logger.debug("Get the latest available version of module {} in your classpath", nameVersion.getName()); - errors.add(String.format("Can't find module %s:%s in your classpath; loaded description for the latest available version.", + errors.add(String.format("Can't find module %s:%s in your classpath; " + + "loaded description for the latest available version.", nameVersion.getName(), nameVersion.getVersion())); return ModuleSelectionInfo.latestVersion(module); } @@ -397,11 +398,14 @@ public class GameDetailsScreen extends CoreScreenLayer { if (wgi != null) { display = wgi.getDisplayName(); } - return translationSystem.translate("${engine:menu#game-details-game-title} ") + theGameInfo.getManifest().getTitle() + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-last-play}: ") + DATE_FORMAT.format(theGameInfo.getTimestamp()) + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-game-duration} ") + DateTimeHelper - .getDeltaBetweenTimestamps(new Date(0).getTime(), theGameInfo.getManifest().getTime()) + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-game-seed} ") + theGameInfo.getManifest().getSeed() + '\n' + '\n' + + return translationSystem.translate("${engine:menu#game-details-game-title} ") + + theGameInfo.getManifest().getTitle() + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-last-play}: ") + + DATE_FORMAT.format(theGameInfo.getTimestamp()) + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-game-duration} ") + + DateTimeHelper.getDeltaBetweenTimestamps(new Date(0).getTime(), theGameInfo.getManifest().getTime()) + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-game-seed} ") + + theGameInfo.getManifest().getSeed() + '\n' + '\n' + translationSystem.translate("${engine:menu#game-details-world-generator}: ") + '\t' + display; } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java index 8f0d0eb4c..0f3a9b679 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java @@ -238,7 +238,8 @@ public class ModuleDetailsScreen extends CoreScreenLayer { installedVersion.bindText(new ReadOnlyBinding() { @Override public String get() { - if (dependencyInfoBinding.get() != null && moduleManager.getRegistry().getLatestModuleVersion(dependencyInfoBinding.get().getId()) != null) { + if (dependencyInfoBinding.get() != null + && moduleManager.getRegistry().getLatestModuleVersion(dependencyInfoBinding.get().getId()) != null) { return String.valueOf(moduleManager.getRegistry().getLatestModuleVersion(dependencyInfoBinding.get().getId()).getVersion()); } return ""; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/IdentityIOHelper.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/IdentityIOHelper.java index 49aeb1da5..f67a9eb4b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/IdentityIOHelper.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/IdentityIOHelper.java @@ -118,7 +118,8 @@ public final class IdentityIOHelper { try (BufferedWriter writer = Files.newBufferedWriter(path, StandardOpenOption.CREATE)) { GSON.toJson(identities, MAP_TYPE, writer); nuiManager.pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage(exportPopupTitle, - String.format(translationSystem.translate("${engine:menu#identity-export-ok}"), identities.size(), path.toString())); + String.format(translationSystem.translate("${engine:menu#identity-export-ok}"), identities.size(), + path.toString())); } catch (IOException | JsonIOException ex) { nuiManager.pushScreen(MessagePopup.ASSET_URI, MessagePopup.class) .setMessage(translationSystem.translate("${engine:menu#identity-export-fail}"), ex.toString()); @@ -127,7 +128,8 @@ public final class IdentityIOHelper { if (Files.exists(path)) { ConfirmPopup confirm = nuiManager.pushScreen(ConfirmPopup.ASSET_URI, ConfirmPopup.class); - confirm.setMessage(exportPopupTitle, String.format(translationSystem.translate("${engine:menu#existing-file-warning}"), path.toString())); + confirm.setMessage(exportPopupTitle, String.format(translationSystem.translate("${engine:menu#existing-file-warning}"), + path.toString())); confirm.setOkHandler(action); } else { action.run(); 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 d717fbcee..0d0c466a6 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 @@ -14,7 +14,9 @@ public class PresetBinding implements Binding { @Override public Preset get() { - if (config.isFlickeringLight() && config.isVignette() && config.isEyeAdaptation() && config.isFilmGrain() && config.isNormalMapping()) { + if (config.isFlickeringLight() + && config.isVignette() && config.isEyeAdaptation() + && config.isFilmGrain() && config.isNormalMapping()) { if (config.isSsao()) { if (config.isBloom() && config.isMotionBlur() && config.isLightShafts() && config.isCloudShadows()) { return Preset.ULTRA; @@ -30,7 +32,8 @@ public class PresetBinding implements Binding { } else if (!config.isMotionBlur() && !config.isLightShafts()) { return Preset.LOW; } - } else if (!config.isBloom() && !config.isMotionBlur() && !config.isFlickeringLight() && !config.isVignette() && !config.isEyeAdaptation() && !config.isFilmGrain()) { + } else if (!config.isBloom() && !config.isMotionBlur() && !config.isFlickeringLight() + && !config.isVignette() && !config.isEyeAdaptation() && !config.isFilmGrain()) { return Preset.MINIMAL; } return Preset.CUSTOM; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinWithUrn.java b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinWithUrn.java index e16917cd3..6600741b7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinWithUrn.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinWithUrn.java @@ -12,7 +12,8 @@ import java.util.Map; /** * [NOTE] Sub-classing UISkin into UISkinWithUrn is a work-around in order to associate a ResourceUrn with a UISkin. - * When a UISkin is deserialised (via UISkinTypeHandler), then it is copied into a new UISkinWithUrn instance to associate it with the urn it was deserialised with. + * When a UISkin is deserialised (via UISkinTypeHandler), then it is copied into a new UISkinWithUrn instance + * to associate it with the urn it was deserialised with. * * (2021-03-31) It is not clear whether this feature is used anywhere (in the Omega module space) right now. */ diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java index 6f9320dc7..a798ca5e8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java @@ -2,7 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 /** - * This package contains support for skinning nui - a UIStyle provides generic information on how to draw a widget, and a UISkin provides a hierarchy of styles. + * This package contains support for skinning nui - a UIStyle provides generic information on how to draw a widget, + * and a UISkin provides a hierarchy of styles. */ @API package org.terasology.engine.rendering.nui.skin; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/FlowParagraphRenderable.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/FlowParagraphRenderable.java index 03af83e1b..9c1d7d5c8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/FlowParagraphRenderable.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/FlowParagraphRenderable.java @@ -58,7 +58,8 @@ public class FlowParagraphRenderable implements ParagraphRenderable { for (FlowRenderable flowRenderable : line.getFlowRenderables()) { int elementWidth = flowRenderable.getWidth(defaultStyle); - Rectanglei renderableRegion = RectUtility.createFromMinAndSize(insetXAdvance + leftIndent + alignOffset + startPos.x + x, y, elementWidth, lineHeight); + Rectanglei renderableRegion = RectUtility.createFromMinAndSize(insetXAdvance + leftIndent + alignOffset + startPos.x + x, y, + elementWidth, lineHeight); String hyperlink = flowRenderable.getAction(); if (hyperlink != null) { hyperlinkRegister.registerHyperlink(renderableRegion, hyperlink); @@ -81,7 +82,8 @@ public class FlowParagraphRenderable implements ParagraphRenderable { return height; } - private Iterable> updateCacheIfNeeded(ParagraphRenderStyle defaultStyle, int yStart, ContainerRenderSpace containerRenderSpace) { + private Iterable> updateCacheIfNeeded(ParagraphRenderStyle defaultStyle, int yStart, + ContainerRenderSpace containerRenderSpace) { // TODO introduce cache, once the RenderSpace gets stabilized and allows comparing return FlowLineBuilder.getLines(flowParagraphData, defaultStyle, yStart, containerRenderSpace); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/HTMLUtils.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/HTMLUtils.java index 442d77f91..fc81e0f1c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/HTMLUtils.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/HTMLUtils.java @@ -173,7 +173,8 @@ public final class HTMLUtils { return getStyleContainerInteger(attributes, groupName, "right", 1, 1, 1); } - private static ContainerInteger getStyleContainerInteger(Attributes attributes, String groupName, String sideName, int fourIndex, int threeIndex, int twoIndex) { + private static ContainerInteger getStyleContainerInteger(Attributes attributes, String groupName, String sideName, + int fourIndex, int threeIndex, int twoIndex) { String elementStr = getStyleAttribute(attributes, groupName + "-" + sideName); if (elementStr != null) { return parseContainerInteger(elementStr); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/ParagraphBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/ParagraphBuilder.java index a78ebd836..c9093984f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/ParagraphBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/ParagraphBuilder.java @@ -63,7 +63,8 @@ public class ParagraphBuilder implements HTMLBlockBuilder { for (Map.Entry flowRenderableFactoryEntry : flowRenderableFactoryMap.entrySet()) { if (flowRenderableFactoryEntry.getKey().equalsIgnoreCase(tag)) { - paragraphData.append(flowRenderableFactoryEntry.getValue().create(attributes, htmlFontResolver.getFont(fontName, bold), color, hyperlink)); + paragraphData.append(flowRenderableFactoryEntry.getValue() + .create(attributes, htmlFontResolver.getFont(fontName, bold), color, hyperlink)); return true; } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/ListParagraphRenderable.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/ListParagraphRenderable.java index ac4a8996e..eb2cf7584 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/ListParagraphRenderable.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/ListParagraphRenderable.java @@ -37,6 +37,7 @@ public class ListParagraphRenderable implements ParagraphRenderable { @Override public void renderContents(Canvas canvas, Vector2i startPos, ContainerRenderSpace containerRenderSpace, int leftIndent, int rightIndent, ParagraphRenderStyle defaultStyle, HorizontalAlign horizontalAlign, HyperlinkRegister hyperlinkRegister) { - multiBlockParagraphRenderable.renderContents(canvas, startPos, containerRenderSpace, leftIndent, rightIndent, defaultStyle, horizontalAlign, hyperlinkRegister); + multiBlockParagraphRenderable.renderContents(canvas, startPos, containerRenderSpace, leftIndent, rightIndent, + defaultStyle, horizontalAlign, hyperlinkRegister); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/OrderedListDecorator.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/OrderedListDecorator.java index 485de3ac2..27aed20d9 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/OrderedListDecorator.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/OrderedListDecorator.java @@ -59,11 +59,13 @@ public class OrderedListDecorator implements ListDecorator { } @Override - public int getPreferredContentsHeight(ParagraphRenderStyle defaultStyle, int yStart, ContainerRenderSpace containerRenderSpace, int sideIndents) { + public int getPreferredContentsHeight(ParagraphRenderStyle defaultStyle, int yStart, + ContainerRenderSpace containerRenderSpace, int sideIndents) { FallbackParagraphRenderStyle fallbackStyle = new FallbackParagraphRenderStyle(defaultStyle, paragraphData.getParagraphRenderStyle()); Font font = fallbackStyle.getFont(false); int maxIndent = getMaxIndent(font); - return paragraphData.getParagraphContents().getPreferredContentsHeight(fallbackStyle, yStart, containerRenderSpace, sideIndents + maxIndent); + return paragraphData.getParagraphContents().getPreferredContentsHeight(fallbackStyle, yStart, + containerRenderSpace, sideIndents + maxIndent); } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/UnorderedListDecorator.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/UnorderedListDecorator.java index 9e9c3c995..a19200766 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/UnorderedListDecorator.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/UnorderedListDecorator.java @@ -52,11 +52,13 @@ public class UnorderedListDecorator implements ListDecorator { } @Override - public int getPreferredContentsHeight(ParagraphRenderStyle defaultStyle, int yStart, ContainerRenderSpace containerRenderSpace, int sideIndents) { + public int getPreferredContentsHeight(ParagraphRenderStyle defaultStyle, int yStart, + ContainerRenderSpace containerRenderSpace, int sideIndents) { FallbackParagraphRenderStyle fallbackStyle = new FallbackParagraphRenderStyle(defaultStyle, paragraphData.getParagraphRenderStyle()); Font font = fallbackStyle.getFont(false); int maxIndent = getMaxIndent(font); - return paragraphData.getParagraphContents().getPreferredContentsHeight(defaultStyle, yStart, containerRenderSpace, sideIndents + maxIndent); + return paragraphData.getParagraphContents() + .getPreferredContentsHeight(defaultStyle, yStart, containerRenderSpace, sideIndents + maxIndent); } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/DocumentRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/DocumentRenderer.java index 90475ffcb..a5a30b7a2 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/DocumentRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/DocumentRenderer.java @@ -47,7 +47,8 @@ public final class DocumentRenderer { return new Vector2i(documentWidth, preferredHeight + documentVerticalMargins); } - public static int getParagraphsMinimumWidth(int availableWidth, ParagraphRenderStyle baseParagraphRenderStyle, Collection paragraphs) { + public static int getParagraphsMinimumWidth(int availableWidth, ParagraphRenderStyle baseParagraphRenderStyle, + Collection paragraphs) { int minParagraphsWidth = 0; for (ParagraphData paragraphData : paragraphs) { ParagraphRenderStyle paragraphRenderStyle = getParagraphRenderStyle(baseParagraphRenderStyle, paragraphData); @@ -109,7 +110,8 @@ public final class DocumentRenderer { + paragraphRenderStyle.getParagraphPaddingLeft().getValue(containerWidth) + paragraphRenderStyle.getParagraphPaddingRight().getValue(containerWidth); - yShift += paragraphData.getParagraphContents().getPreferredContentsHeight(paragraphRenderStyle, yShift, containerRenderSpace, paragraphSideIndent); + yShift += paragraphData.getParagraphContents().getPreferredContentsHeight(paragraphRenderStyle, yShift, + containerRenderSpace, paragraphSideIndent); yShift += paragraphRenderStyle.getParagraphPaddingBottom().getValue(containerWidth) + paragraphRenderStyle.getParagraphMarginBottom().getValue(containerWidth); @@ -139,7 +141,8 @@ public final class DocumentRenderer { ContainerFlowContainerRenderSpace renderSpace = new ContainerFlowContainerRenderSpace(documentWidth); - renderParagraphs(canvas, register, documentRenderStyle, documentMarginLeft, documentMarginTop, documentMarginLeft, documentMarginRight, paragraphs, renderSpace); + renderParagraphs(canvas, register, documentRenderStyle, documentMarginLeft, documentMarginTop, + documentMarginLeft, documentMarginRight, paragraphs, renderSpace); } public static void renderParagraphs(Canvas canvas, ParagraphRenderable.HyperlinkRegister register, ParagraphRenderStyle baseRenderStyle, 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 ee8d03d5c..872142ed7 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 @@ -91,12 +91,17 @@ public final class FBO { * Meanwhile shaders might output not just colors but additional per-pixel data. This method establishes on which * of an FBOs attachments, subsequent opengl commands and shaders will draw on. * - * @param renderToColorBuffer If True the color buffer is set as drawable. If false subsequent commands and shaders won't be able to draw on it. - * @param renderToNormalsBuffer If True the normal buffer is set as drawable. If false subsequent commands and shaders won't be able to draw on it. - * @param renderToLightBuffer If True the light buffer is set as drawable. If false subsequent commands and shaders won't be able to draw on it. + * @param renderToColorBuffer If True the color buffer is set as drawable. + * If false subsequent commands and shaders won't be able to draw on it. + * @param renderToNormalsBuffer If True the normal buffer is set as drawable. + * If false subsequent commands and shaders won't be able to draw on it. + * @param renderToLightBuffer If True the light buffer is set as drawable. + * If false subsequent commands and shaders won't be able to draw on it. */ public void setRenderBufferMask(boolean renderToColorBuffer, boolean renderToNormalsBuffer, boolean renderToLightBuffer) { - if (this.writeToColorBuffer == renderToColorBuffer && this.writeToNormalsBuffer == renderToNormalsBuffer && this.writeToLightBuffer == renderToLightBuffer) { + if (this.writeToColorBuffer == renderToColorBuffer + && this.writeToNormalsBuffer == renderToNormalsBuffer + && this.writeToLightBuffer == renderToLightBuffer) { return; } @@ -610,7 +615,8 @@ public final class FBO { } private static void allocateTexture(Dimensions dimensions, int internalFormat, int dataFormat, int dataType) { - GL30.glTexImage2D(GL11.GL_TEXTURE_2D, 0, internalFormat, dimensions.width, dimensions.height, 0, dataFormat, dataType, (ByteBuffer) null); + GL30.glTexImage2D(GL11.GL_TEXTURE_2D, 0, internalFormat, dimensions.width, dimensions.height, + 0, dataFormat, dataType, (ByteBuffer) null); } /** 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 1a98a1e7b..bc5123eca 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 @@ -75,7 +75,8 @@ public class GLSLMaterial extends BaseMaterial { }); } - public static GLSLMaterial create(ResourceUrn urn, LwjglGraphicsProcessing graphicsProcessing, AssetType assetType, MaterialData data) { + public static GLSLMaterial create(ResourceUrn urn, LwjglGraphicsProcessing graphicsProcessing, + AssetType assetType, MaterialData data) { return new GLSLMaterial(urn, assetType, data, graphicsProcessing, new DisposalAction(urn, graphicsProcessing)); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLShader.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLShader.java index 021b18777..c29a538c5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLShader.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLShader.java @@ -101,7 +101,8 @@ public class GLSLShader extends Shader { } - public static GLSLShader create(ResourceUrn urn, AssetType assetType, ShaderData data, LwjglGraphicsProcessing graphicsProcessing) { + public static GLSLShader create(ResourceUrn urn, AssetType assetType, ShaderData data, + LwjglGraphicsProcessing graphicsProcessing) { return new GLSLShader(urn, assetType, data, new GLSLShader.DisposalAction(urn, graphicsProcessing), graphicsProcessing); } 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 23ed46e67..fe47cd7d2 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 @@ -80,13 +80,16 @@ public class OpenGLSkeletalMesh extends SkeletalMesh { GL30.glBindBuffer(GL30.GL_ARRAY_BUFFER, this.disposalAction.vbo); GL30.glEnableVertexAttribArray(StandardMeshData.VERTEX_INDEX); - GL30.glVertexAttribPointer(StandardMeshData.VERTEX_INDEX, 3, GL30.GL_FLOAT, false, VERTEX_NORMAL_SIZE, 0); + GL30.glVertexAttribPointer(StandardMeshData.VERTEX_INDEX, 3, GL30.GL_FLOAT, false, + VERTEX_NORMAL_SIZE, 0); GL30.glEnableVertexAttribArray(StandardMeshData.NORMAL_INDEX); - GL30.glVertexAttribPointer(StandardMeshData.NORMAL_INDEX, 3, GL30.GL_FLOAT, false, VERTEX_NORMAL_SIZE, VERTEX_SIZE); + GL30.glVertexAttribPointer(StandardMeshData.NORMAL_INDEX, 3, GL30.GL_FLOAT, false, + VERTEX_NORMAL_SIZE, VERTEX_SIZE); GL30.glEnableVertexAttribArray(StandardMeshData.UV0_INDEX); - GL30.glVertexAttribPointer(StandardMeshData.UV0_INDEX, 2, GL30.GL_FLOAT, false, UV_SIZE, (long) VERTEX_NORMAL_SIZE * newData.getVertexCount()); + GL30.glVertexAttribPointer(StandardMeshData.UV0_INDEX, 2, GL30.GL_FLOAT, false, + UV_SIZE, (long) VERTEX_NORMAL_SIZE * newData.getVertexCount()); int payloadSize = (UV_SIZE + VERTEX_SIZE + NORMAL_SIZE) * newData.getVertexCount(); ByteBuffer buffer = BufferUtils.createByteBuffer(payloadSize); diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java index 2aeac7b19..d1f9c9ae3 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java @@ -13,7 +13,8 @@ public final class TessellatorHelper { private TessellatorHelper() { } - public static void addBlockMesh(Tessellator tessellator, Vector4f color, float size, float light1, float light2, float posX, float posY, float posZ) { + public static void addBlockMesh(Tessellator tessellator, Vector4f color, float size, + float light1, float light2, float posX, float posY, float posZ) { Vector2f defaultSize = new Vector2f(1.0f, 1.0f); Vector2f defaultOffset = new Vector2f(0.0f, 0.0f); addBlockMesh(tessellator, color, defaultOffset, defaultSize, size, light1, light2, posX, posY, posZ); 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 0f0882267..bf5dc85d6 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 @@ -338,7 +338,10 @@ class RenderableWorldImpl implements RenderableWorld { if (isChunkValidForRender(chunk)) { mesh = chunk.getMesh(); - if (isDynamicShadows && isFirstRenderingStageForCurrentFrame && chunkCounter < maxChunksForShadows && isChunkVisibleFromMainLight(chunk)) { + if (isDynamicShadows + && isFirstRenderingStageForCurrentFrame + && chunkCounter < maxChunksForShadows + && isChunkVisibleFromMainLight(chunk)) { if (triangleCount(mesh, ChunkMesh.RenderPhase.OPAQUE) > 0) { renderQueues.chunksOpaqueShadow.add(chunk); } else { 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 b31bb9b0b..e0161d2fe 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java @@ -92,7 +92,8 @@ public class Metrics { } /** - * Add a metric instance to Metrics. This method will only be used when a metric constructor needs specific other than {@link org.terasology.engine.context.Context} + * Add a metric instance to Metrics. This method will only be used when a metric constructor needs specific + * other than {@link org.terasology.engine.context.Context} * @param metric a new metric that constructor needs some arguments other than {@link org.terasology.engine.context.Context} */ public void addMetric(Metric metric) { 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 d2fca5268..47f6551ad 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java @@ -69,7 +69,8 @@ public final class TelemetryUtils { * @param nameSpace The name the class tracking this metric. * @param bindingMap the binding map contains fields who has user's permission. */ - public static void fetchMetricAndSend(Metrics metrics, Class metricClass, Emitter emitter, String nameSpace, Map bindingMap) { + public static void fetchMetricAndSend(Metrics metrics, Class metricClass, Emitter emitter, + String nameSpace, Map bindingMap) { Optional optional = metrics.getMetric(metricClass); if (optional.isPresent()) { Metric metric = optional.get(); @@ -89,7 +90,8 @@ public final class TelemetryUtils { * @param metric the Metric class instance that this event belongs to. * @param telemetryConfiguration the telemetryConfiguration adapter which could be used in modules. */ - public static void trackMetric(Emitter emitter, String nameSpace, Unstructured event, Metric metric, TelemetryConfiguration telemetryConfiguration) { + public static void trackMetric(Emitter emitter, String nameSpace, Unstructured event, + Metric metric, TelemetryConfiguration telemetryConfiguration) { AccessController.doPrivileged((PrivilegedAction) () -> { Context context = CoreRegistry.get(Context.class); DisplayDevice display = context.get(DisplayDevice.class); @@ -117,7 +119,8 @@ public final class TelemetryUtils { * @param metric the Metric class instance that this event belongs to. * @param bindingMap the binding map contains fields who has user's permission. */ - public static void trackMetric(Emitter emitter, String nameSpace, Unstructured event, Metric metric, Map bindingMap) { + public static void trackMetric(Emitter emitter, String nameSpace, Unstructured event, + Metric metric, Map bindingMap) { AccessController.doPrivileged((PrivilegedAction) () -> { Context context = CoreRegistry.get(Context.class); DisplayDevice display = context.get(DisplayDevice.class); 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 d56b3f4ce..cdb131d5e 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 @@ -13,8 +13,10 @@ import org.terasology.engine.telemetry.TelemetryParams; import java.io.IOException; /** - * This class append the user id to error log. And then the {@link org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender} will send logs to the server. - * The user id is based on user's MAC address. Normally it differs from one to another. + * This class append the user id to error log. + * And then the {@link org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender} will send logs to the server. + * The user id is based on user's MAC address. + * Normally it differs from one to another. */ public class UserIdJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { 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 b1fabf55d..466ffe942 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 @@ -32,7 +32,8 @@ import java.util.Set; * All metric fields should be annotated {@link org.terasology.engine.telemetry.TelemetryField}. * An example is {@link org.terasology.engine.telemetry.metrics.SystemContextMetric}. * The metric will be instantiated automatically in {@link org.terasology.engine.telemetry.Metrics} - * By convention, a new Metric can have only one constructor and constructor will need no arguments or only {@link org.terasology.engine.context.Context}. + * By convention, a new Metric can have only one constructor and constructor will need no arguments + * or only {@link org.terasology.engine.context.Context}. * If a Metric Constructor needs some specific arguments other than {@link org.terasology.engine.context.Context}, * it should be instantiated and added to {@link org.terasology.engine.telemetry.Metrics} manually. */ @@ -57,7 +58,8 @@ public abstract class Metric { /** * Generates a snowplow unstructured event. * This method helps to implement abstract getUnstructuredMetric method. - * You can find example in {@link org.terasology.engine.telemetry.metrics.ModulesMetric} and {@link org.terasology.engine.telemetry.metrics.SystemContextMetric} + * You can find example in {@link org.terasology.engine.telemetry.metrics.ModulesMetric} + * and {@link org.terasology.engine.telemetry.metrics.SystemContextMetric} * @param schema the snowplow event register schema. * @param mapSentToServer the map that contains the data sent to the server. * @return Null option if the mapSentToServer doesn't contain data. @@ -155,7 +157,8 @@ public abstract class Metric { /** * Add the new metric to {@link org.terasology.engine.telemetry.Metrics} instance. - * This method will only be used when a metric constructor needs some specific arguments other than {@link org.terasology.engine.context.Context}. + * This method will only be used when a metric constructor needs some specific arguments + * other than {@link org.terasology.engine.context.Context}. * @param metrics the metrics class instance in the game context. */ public void addToMetrics(Metrics metrics) { diff --git a/engine/src/main/java/org/terasology/engine/utilities/procedural/PerlinNoise.java b/engine/src/main/java/org/terasology/engine/utilities/procedural/PerlinNoise.java index ceb4be7aa..9febe1861 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/procedural/PerlinNoise.java +++ b/engine/src/main/java/org/terasology/engine/utilities/procedural/PerlinNoise.java @@ -7,7 +7,8 @@ import org.terasology.math.TeraMath; /** * Improved Perlin noise based on the reference implementation by Ken Perlin. - * @deprecated Prefer using {@link SimplexNoise}, it is comparable to Perlin noise (fewer directional artifacts, lower computational overhead for higher dimensions). + * @deprecated Prefer using {@link SimplexNoise}, it is comparable to Perlin noise + * (fewer directional artifacts, lower computational overhead for higher dimensions). * */ @Deprecated @@ -30,7 +31,8 @@ public class PerlinNoise extends AbstractNoise implements Noise2D, Noise3D { * Supports tileable noise generation * * @param seed The seed value - * @param gridDim gridDim x gridDim will be the size of the perlin's grid of vectors, noise will be tiled if an input coordinate crosses a multiple of gridDim + * @param gridDim gridDim x gridDim will be the size of the perlin's grid of vectors, + * noise will be tiled if an input coordinate crosses a multiple of gridDim */ public PerlinNoise(long seed, int gridDim) { FastRandom rand = new FastRandom(seed); diff --git a/engine/src/main/java/org/terasology/engine/utilities/procedural/SubSampledNoise.java b/engine/src/main/java/org/terasology/engine/utilities/procedural/SubSampledNoise.java index 30581b44e..5a8ce4219 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/procedural/SubSampledNoise.java +++ b/engine/src/main/java/org/terasology/engine/utilities/procedural/SubSampledNoise.java @@ -67,7 +67,8 @@ public class SubSampledNoise extends AbstractNoise { float[] result = new float[subRegion.getSizeX() * subRegion.getSizeY()]; Vector2i offset = new Vector2i(subRegion.minX() - fullRegion.minX(), subRegion.minY() - fullRegion.minY()); for (int y = 0; y < subRegion.getSizeY(); ++y) { - System.arraycopy(fullData, offset.x() + fullRegion.getSizeX() * (y + offset.y()), result, subRegion.getSizeX() * y, subRegion.getSizeX()); + System.arraycopy(fullData, offset.x() + fullRegion.getSizeX() * (y + offset.y()), result, + subRegion.getSizeX() * y, subRegion.getSizeX()); } return result; } else { @@ -155,9 +156,13 @@ public class SubSampledNoise extends AbstractNoise { } private float[] getSubset(float[] fullData, BlockRegion fullRegion, BlockRegion subRegion) { - if (subRegion.getSizeX() != fullRegion.getSizeX() || subRegion.getSizeY() != fullRegion.getSizeY() || subRegion.getSizeZ() != fullRegion.getSizeZ()) { + if (subRegion.getSizeX() != fullRegion.getSizeX() + || subRegion.getSizeY() != fullRegion.getSizeY() + || subRegion.getSizeZ() != fullRegion.getSizeZ()) { float[] result = new float[subRegion.getSizeX() * subRegion.getSizeY() * subRegion.getSizeZ()]; - Vector3i offset = new Vector3i(subRegion.minX() - fullRegion.minX(), subRegion.minY() - fullRegion.minY(), subRegion.minZ() - fullRegion.minZ()); + Vector3i offset = new Vector3i(subRegion.minX() - fullRegion.minX(), + subRegion.minY() - fullRegion.minY(), + subRegion.minZ() - fullRegion.minZ()); for (int z = 0; z < subRegion.getSizeZ(); ++z) { for (int y = 0; y < subRegion.getSizeY(); ++y) { System.arraycopy(fullData, offset.x + fullRegion.getSizeX() * (y + offset.y + fullRegion.getSizeY() * (z + offset.z)), @@ -189,9 +194,12 @@ public class SubSampledNoise extends AbstractNoise { for (int innerZ = 0; innerZ < sampleRate; ++innerZ) { for (int innerY = 0; innerY < sampleRate; ++innerY) { for (int innerX = 0; innerX < sampleRate; ++innerX) { - fullData[x * sampleRate + innerX + fullRegion.getSizeX() * (y * sampleRate + innerY + fullRegion.getSizeY() * (z * sampleRate + innerZ))] = + fullData[x * sampleRate + innerX + fullRegion.getSizeX() + * (y * sampleRate + innerY + fullRegion.getSizeY() * (z * sampleRate + innerZ))] = TeraMath.triLerp(q000, q100, q010, q110, q001, q101, q011, q111, - (float) innerX / sampleRate, (float) innerY / sampleRate, (float) innerZ / sampleRate); + (float) innerX / sampleRate, + (float) innerY / sampleRate, + (float) innerZ / sampleRate); } } } @@ -212,7 +220,9 @@ public class SubSampledNoise extends AbstractNoise { int actualX = x * sampleRate + fullRegion.minX(); int actualY = y * sampleRate + fullRegion.minY(); int actualZ = z * sampleRate + fullRegion.minZ(); - fullData[x + xDim * (y + yDim * z)] = source.noise(zoom.x * scale * actualX, zoom.y * scale * actualY, zoom.z * scale * actualZ); + fullData[x + xDim * (y + yDim * z)] = source.noise(zoom.x * scale * actualX, + zoom.y * scale * actualY, + zoom.z * scale * actualZ); } } } 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 d710ef848..f76b4493d 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 @@ -57,8 +57,10 @@ public class Voronoi { Vector2f cellPos = new Vector2f(at); cellPos.x -= cellX; cellPos.y -= cellY; - Vector2f distMax = new Vector2f(standardDistanceFunction(new Vector2f(1 - cellPos.x, 0)), standardDistanceFunction(new Vector2f(0, 1 - cellPos.y))); - Vector2f distMin = new Vector2f(standardDistanceFunction(new Vector2f(cellPos.x, 0)), standardDistanceFunction(new Vector2f(0, cellPos.y))); + Vector2f distMax = new Vector2f(standardDistanceFunction(new Vector2f(1 - cellPos.x, 0)), + standardDistanceFunction(new Vector2f(0, 1 - cellPos.y))); + Vector2f distMin = new Vector2f(standardDistanceFunction(new Vector2f(cellPos.x, 0)), + standardDistanceFunction(new Vector2f(0, cellPos.y))); // Test near cells if (distMin.x < results[results.length - 1].distance) { 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 5a5943de8..d6936d107 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 @@ -27,7 +27,8 @@ public class SpecificAccessibleObject { this.target = target; } - public static SpecificAccessibleObject method(Object target, String name, Class... parameterTypes) throws NoSuchMethodException { + public static SpecificAccessibleObject method(Object target, String name, Class... parameterTypes) + throws NoSuchMethodException { Class targetClass = target.getClass(); Method method = targetClass.getMethod(name, parameterTypes); @@ -41,7 +42,8 @@ public class SpecificAccessibleObject { return new SpecificAccessibleObject<>(field, target); } - public static SpecificAccessibleObject declaredMethod(Object target, String name, Class... parameterTypes) throws NoSuchMethodException { + public static SpecificAccessibleObject declaredMethod(Object target, String name, Class... parameterTypes) + throws NoSuchMethodException { Class targetClass = target.getClass(); Method method = targetClass.getDeclaredMethod(name, parameterTypes); 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 0dcbc010e..60bd8b7c8 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 @@ -47,28 +47,34 @@ public interface BlockBuilderHelper { * @param blockFamily The block family instance this block will belong to * @return The constructed and registered block */ - Block constructSimpleBlock(BlockFamilyDefinition definition, BlockShape shape, String section, BlockUri uri, BlockFamily blockFamily); + Block constructSimpleBlock(BlockFamilyDefinition definition, BlockShape shape, String section, + BlockUri uri, BlockFamily blockFamily); /** * @see #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily) */ - Block constructTransformedBlock(BlockFamilyDefinition definition, Rotation rotation, BlockUri uri, BlockFamily blockFamily); + Block constructTransformedBlock(BlockFamilyDefinition definition, Rotation rotation, + BlockUri uri, BlockFamily blockFamily); /** * @see #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily) */ - Block constructTransformedBlock(BlockFamilyDefinition definition, String section, Rotation rotation, BlockUri uri, BlockFamily blockFamily); + Block constructTransformedBlock(BlockFamilyDefinition definition, String section, Rotation rotation, + BlockUri uri, BlockFamily blockFamily); /** * @see #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily) */ - Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, Rotation rotation, BlockUri uri, BlockFamily blockFamily); + Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, Rotation rotation, + BlockUri uri, BlockFamily blockFamily); /** * Construct a block that has a specific rotation applied to it. *

- * For blocks that do not have a rotation, see {@link #constructSimpleBlock(BlockFamilyDefinition, BlockShape, String, BlockUri, BlockFamily)} - * For blocks that require more custom control/values see {@link #constructCustomBlock(String, BlockShape, Rotation, SectionDefinitionData, BlockUri, BlockFamily)} + * For blocks that do not have a rotation, see + * {@link #constructSimpleBlock(BlockFamilyDefinition, BlockShape, String, BlockUri, BlockFamily)} + * For blocks that require more custom control/values see + * {@link #constructCustomBlock(String, BlockShape, Rotation, SectionDefinitionData, BlockUri, BlockFamily)} * * @param definition The definition for the block family this block will belong to * @param shape The shape to apply to the block @@ -78,7 +84,8 @@ public interface BlockBuilderHelper { * @param blockFamily The instance of the block family this block will belong to * @return */ - Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, String section, Rotation rotation, BlockUri uri, BlockFamily blockFamily); + Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, String section, Rotation rotation, + BlockUri uri, BlockFamily blockFamily); /** * Construct a block as a member of a family with specified values and information. @@ -94,5 +101,6 @@ public interface BlockBuilderHelper { * @param blockFamily The family instance to add to the block * @return The newly created and registered block */ - Block constructCustomBlock(String defaultName, BlockShape shape, Rotation rotation, SectionDefinitionData section, BlockUri uri, BlockFamily blockFamily); + Block constructCustomBlock(String defaultName, BlockShape shape, Rotation rotation, SectionDefinitionData section, + BlockUri uri, BlockFamily blockFamily); } diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockUri.java b/engine/src/main/java/org/terasology/engine/world/block/BlockUri.java index e79cb883c..7a10a88f2 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockUri.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockUri.java @@ -12,8 +12,8 @@ import org.terasology.gestalt.naming.Name; import java.util.Optional; /** - * Identifier for both blocks and block families. It is a combination of the ResourceUrn of a block family definition, the id of a block, and optionally the - * ResourceUrn of a shape. + * Identifier for both blocks and block families. It is a combination of the ResourceUrn of a block family definition, + * the id of a block, and optionally the ResourceUrn of a shape. * The final pattern is (see {@link BlockUri} for details): * [package]:[blockFamily]:[shapePackage]:[shapeName].[blockIdentifier] * the third and forth parts are only used for blocks that don't use the engine:cube shape, and which diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/BlockEntitySystem.java b/engine/src/main/java/org/terasology/engine/world/block/entity/BlockEntitySystem.java index 13dab1763..74f1125ba 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/BlockEntitySystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/BlockEntitySystem.java @@ -130,7 +130,8 @@ public class BlockEntitySystem extends BaseComponentSystem { } } - private boolean shouldDropToWorld(CreateBlockDropsEvent event, Block block, BlockDamageModifierComponent blockDamageModifierComponent, EntityRef item) { + private boolean shouldDropToWorld(CreateBlockDropsEvent event, Block block, + BlockDamageModifierComponent blockDamageModifierComponent, EntityRef item) { return !isDirectPickup(block, blockDamageModifierComponent) || !giveItem(event, item); } @@ -156,7 +157,8 @@ public class BlockEntitySystem extends BaseComponentSystem { // 'CoreAssets' from the engine EntityBuilder dustBuilder = entityManager.newBuilder("CoreAssets:dustEffect"); if (dustBuilder.hasComponent(LocationComponent.class)) { - dustBuilder.getComponent(LocationComponent.class).setWorldPosition(entity.getComponent(LocationComponent.class).getWorldPosition(new Vector3f())); + dustBuilder.getComponent(LocationComponent.class) + .setWorldPosition(entity.getComponent(LocationComponent.class).getWorldPosition(new Vector3f())); dustBuilder.build(); } } diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/AttachedToSurfaceFamily.java b/engine/src/main/java/org/terasology/engine/world/block/family/AttachedToSurfaceFamily.java index f62535ce6..1cbef39ea 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/family/AttachedToSurfaceFamily.java +++ b/engine/src/main/java/org/terasology/engine/world/block/family/AttachedToSurfaceFamily.java @@ -38,7 +38,8 @@ public class AttachedToSurfaceFamily extends AbstractBlockFamily { Map blockMap = Maps.newEnumMap(Side.class); if (definition.getData().hasSection("top")) { - Block block = blockBuilder.constructSimpleBlock(definition, "top", new BlockUri(definition.getUrn(), new Name(Side.TOP.name())), this); + Block block = blockBuilder.constructSimpleBlock(definition, "top", new BlockUri(definition.getUrn(), + new Name(Side.TOP.name())), this); block.setRotation(Rotation.rotate(Pitch.CLOCKWISE_270)); blockMap.put(Side.TOP, block); } @@ -50,7 +51,8 @@ public class AttachedToSurfaceFamily extends AbstractBlockFamily { } } if (definition.getData().hasSection("bottom")) { - Block block = blockBuilder.constructSimpleBlock(definition, "bottom", new BlockUri(definition.getUrn(), new Name(Side.BOTTOM.name())), this); + Block block = blockBuilder.constructSimpleBlock(definition, "bottom", new BlockUri(definition.getUrn(), + new Name(Side.BOTTOM.name())), this); block.setRotation(Rotation.rotate(Pitch.CLOCKWISE_90)); blockMap.put(Side.BOTTOM, block); } 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 103bc9236..a7db1027e 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 @@ -43,7 +43,8 @@ public class BlockFamilyLibrary { RegisterBlockFamily registerInfo = entry.getAnnotation(RegisterBlockFamily.class); String id = registerInfo.value(); logger.debug("Registering blockFamily {}", id); - library.register(new ResourceUrn(moduleEnvironment.getModuleProviding(entry).toString(), registerInfo.value()).toString(), (Class) entry); + library.register(new ResourceUrn(moduleEnvironment.getModuleProviding(entry).toString(), registerInfo.value()).toString(), + (Class) entry); } } diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/BlockPlacementData.java b/engine/src/main/java/org/terasology/engine/world/block/family/BlockPlacementData.java index ee1f612e0..d693cfc77 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/family/BlockPlacementData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/family/BlockPlacementData.java @@ -40,7 +40,8 @@ public class BlockPlacementData { /** * @param blockPosition The block position, at which the block is supposed to be placed at - * @param attachmentSide The side of the block which this block is being attached to, e.g. Top if the block is being placed on the ground + * @param attachmentSide The side of the block which this block is being attached to, + * e.g. Top if the block is being placed on the ground * @param viewingDirection The players viewing direction */ public BlockPlacementData(Vector3ic blockPosition, Side attachmentSide, Vector3fc viewingDirection) { @@ -49,9 +50,11 @@ public class BlockPlacementData { /** * @param blockPosition The block position, at which the block is supposed to be placed at - * @param attachmentSide The side of the block which this block is being attached to, e.g. Top if the block is being placed on the ground + * @param attachmentSide The side of the block which this block is being attached to, + * e.g. Top if the block is being placed on the ground * @param viewingDirection The players viewing direction - * @param relativeAttachmentPosition The position on the block surface that the user aimed at when placing the block. A vector in the range (0..1, 0..1) + * @param relativeAttachmentPosition The position on the block surface that the user aimed at when placing the block. + * A vector in the range (0..1, 0..1) */ public BlockPlacementData(Vector3ic blockPosition, Side attachmentSide, Vector3fc viewingDirection, Vector2fc relativeAttachmentPosition) { this.blockPosition = new Vector3i(Preconditions.checkNotNull(blockPosition)); diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/HorizontalFamily.java b/engine/src/main/java/org/terasology/engine/world/block/family/HorizontalFamily.java index ef7da930a..21c7c4e18 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/family/HorizontalFamily.java +++ b/engine/src/main/java/org/terasology/engine/world/block/family/HorizontalFamily.java @@ -37,8 +37,8 @@ public class HorizontalFamily extends AbstractBlockFamily implements SideDefined } for (Rotation rot : Rotation.horizontalRotations()) { Side side = rot.rotate(Side.FRONT); - Block block = blockBuilder.constructTransformedBlock(definition, shape, side.toString().toLowerCase(Locale.ENGLISH), rot, - new BlockUri(uri, new Name(side.name())), this); + Block block = blockBuilder.constructTransformedBlock(definition, shape, side.toString().toLowerCase(Locale.ENGLISH), + rot, new BlockUri(uri, new Name(side.name())), this); if (block == null) { throw new IllegalArgumentException("Missing block for side: " + side.toString()); } @@ -53,7 +53,8 @@ public class HorizontalFamily extends AbstractBlockFamily implements SideDefined for (Rotation rot : Rotation.horizontalRotations()) { Side side = rot.rotate(Side.FRONT); - Block block = blockBuilder.constructTransformedBlock(definition, side.toString().toLowerCase(Locale.ENGLISH), rot, new BlockUri(uri, new Name(side.name())), this); + Block block = blockBuilder.constructTransformedBlock(definition, side.toString().toLowerCase(Locale.ENGLISH), + rot, new BlockUri(uri, new Name(side.name())), this); if (block == null) { throw new IllegalArgumentException("Missing block for side: " + side.toString()); } diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/MultiConnectFamily.java b/engine/src/main/java/org/terasology/engine/world/block/family/MultiConnectFamily.java index 2170425d7..c42f64140 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/family/MultiConnectFamily.java +++ b/engine/src/main/java/org/terasology/engine/world/block/family/MultiConnectFamily.java @@ -100,14 +100,16 @@ public abstract class MultiConnectFamily extends AbstractBlockFamily implements * @param rotations All of the ways the block should be rotated * @return All of the rotations possible for the block with the given sides */ - public Set registerBlock(BlockUri root, BlockFamilyDefinition definition, BlockBuilderHelper blockBuilder, String name, byte sides, Iterable rotations) { + public Set registerBlock(BlockUri root, BlockFamilyDefinition definition, BlockBuilderHelper blockBuilder, String name, + byte sides, Iterable rotations) { Set result = Sets.newLinkedHashSet(); for (Rotation rotation: rotations) { byte sideBits = 0; for (Side side : SideBitFlag.getSides(sides)) { sideBits += SideBitFlag.getSide(rotation.rotate(side)); } - Block block = blockBuilder.constructTransformedBlock(definition, name, rotation, new BlockUri(root, new Name(String.valueOf(sideBits))), this); + Block block = blockBuilder.constructTransformedBlock(definition, name, + rotation, new BlockUri(root, new Name(String.valueOf(sideBits))), this); blocks.put(sideBits, block); result.add(block); @@ -125,7 +127,8 @@ public abstract class MultiConnectFamily extends AbstractBlockFamily implements * @param rotations All of the ways the block should be rotated * @return All of the rotations possible for the block with the given sides */ - public Set registerBlock(BlockUri root, BlockFamilyDefinition definition, final BlockBuilderHelper blockBuilder, byte sides, Iterable rotations) { + public Set registerBlock(BlockUri root, BlockFamilyDefinition definition, final BlockBuilderHelper blockBuilder, + byte sides, Iterable rotations) { Set result = Sets.newLinkedHashSet(); for (Rotation rotation: rotations) { byte sideBits = 0; diff --git a/engine/src/main/java/org/terasology/engine/world/block/internal/BlockBuilder.java b/engine/src/main/java/org/terasology/engine/world/block/internal/BlockBuilder.java index a9b7fe847..d1eb584db 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/internal/BlockBuilder.java +++ b/engine/src/main/java/org/terasology/engine/world/block/internal/BlockBuilder.java @@ -41,67 +41,84 @@ public class BlockBuilder implements BlockBuilderHelper { } @Override - public Block constructSimpleBlock(BlockFamilyDefinition definition, BlockUri uri, BlockFamily blockFamily) { + public Block constructSimpleBlock(BlockFamilyDefinition definition, + BlockUri uri, BlockFamily blockFamily) { BlockShape shape = definition.getData().getBaseSection().getShape(); if (shape == null) { shape = cubeShape; } - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), definition.getData().getBaseSection(), uri, blockFamily); + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), + definition.getData().getBaseSection(), uri, blockFamily); } @Override - public Block constructSimpleBlock(BlockFamilyDefinition definition, BlockShape shape, BlockUri uri, BlockFamily blockFamily) { - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), definition.getData().getBaseSection(), uri, blockFamily); + public Block constructSimpleBlock(BlockFamilyDefinition definition, BlockShape shape, + BlockUri uri, BlockFamily blockFamily) { + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), + definition.getData().getBaseSection(), uri, blockFamily); } @Override - public Block constructSimpleBlock(BlockFamilyDefinition definition, String section, BlockUri uri, BlockFamily blockFamily) { + public Block constructSimpleBlock(BlockFamilyDefinition definition, String section, + BlockUri uri, BlockFamily blockFamily) { BlockShape shape = definition.getData().getSection(section).getShape(); if (shape == null) { shape = cubeShape; } - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), definition.getData().getSection(section), uri, blockFamily); + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), + definition.getData().getSection(section), uri, blockFamily); } @Override - public Block constructSimpleBlock(BlockFamilyDefinition definition, BlockShape shape, String section, BlockUri uri, BlockFamily blockFamily) { - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), definition.getData().getSection(section), uri, blockFamily); + public Block constructSimpleBlock(BlockFamilyDefinition definition, BlockShape shape, String section, + BlockUri uri, BlockFamily blockFamily) { + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, Rotation.none(), + definition.getData().getSection(section), uri, blockFamily); } @Override - public Block constructTransformedBlock(BlockFamilyDefinition definition, Rotation rotation, BlockUri uri, BlockFamily blockFamily) { + public Block constructTransformedBlock(BlockFamilyDefinition definition, Rotation rotation, + BlockUri uri, BlockFamily blockFamily) { BlockShape shape = definition.getData().getBaseSection().getShape(); if (shape == null) { shape = cubeShape; } - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, definition.getData().getBaseSection(), uri, blockFamily); + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, + definition.getData().getBaseSection(), uri, blockFamily); } @Override - public Block constructTransformedBlock(BlockFamilyDefinition definition, String section, Rotation rotation, BlockUri uri, BlockFamily blockFamily) { + public Block constructTransformedBlock(BlockFamilyDefinition definition, String section, Rotation rotation, + BlockUri uri, BlockFamily blockFamily) { BlockShape shape = definition.getData().getSection(section).getShape(); if (shape == null) { shape = cubeShape; } - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, definition.getData().getSection(section), uri, blockFamily); + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, + definition.getData().getSection(section), uri, blockFamily); } @Override - public Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, Rotation rotation, BlockUri uri, BlockFamily blockFamily) { - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, definition.getData().getBaseSection(), uri, blockFamily); + public Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, Rotation rotation, + BlockUri uri, BlockFamily blockFamily) { + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, + definition.getData().getBaseSection(), uri, blockFamily); } @Override - public Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, String section, Rotation rotation, BlockUri uri, BlockFamily blockFamily) { - return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, definition.getData().getSection(section), uri, blockFamily); + public Block constructTransformedBlock(BlockFamilyDefinition definition, BlockShape shape, String section, Rotation rotation, + BlockUri uri, BlockFamily blockFamily) { + return constructCustomBlock(definition.getUrn().getResourceName().toString(), shape, rotation, + definition.getData().getSection(section), uri, blockFamily); } @Override - public Block constructCustomBlock(String defaultName, BlockShape shape, Rotation rotation, SectionDefinitionData section, BlockUri uri, BlockFamily blockFamily) { + public Block constructCustomBlock(String defaultName, BlockShape shape, Rotation rotation, SectionDefinitionData section, + BlockUri uri, BlockFamily blockFamily) { Block block = createRawBlock(defaultName, section); block.setRotation(rotation); block.setPrimaryAppearance(createAppearance(shape, section.getBlockTiles(), rotation)); @@ -167,7 +184,8 @@ public class BlockBuilder implements BlockBuilderHelper { Map meshParts = Maps.newEnumMap(BlockPart.class); Map textureAtlasPositions = Maps.newEnumMap(BlockPart.class); for (BlockPart part : BlockPart.values()) { - // TODO: Need to be more sensible with the texture atlas. Because things like block particles read from a part that may not exist, we're being fairly lenient + // TODO: Need to be more sensible with the texture atlas. + // Because things like block particles read from a part that may not exist, we're being fairly lenient Vector2f atlasPos; int frameCount; BlockTile tile = tiles.get(part); diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionFormat.java b/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionFormat.java index ac070c09e..2bdcfd44a 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionFormat.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionFormat.java @@ -208,7 +208,8 @@ public class BlockFamilyDefinitionFormat extends AbstractAssetFileFormat void readBlockPartMap(JsonObject jsonObject, String singleName, - String partsName, Supplier> supplier, Class type, JsonDeserializationContext context) { + String partsName, Supplier> supplier, Class type, + JsonDeserializationContext context) { if (jsonObject.has(singleName)) { T value = context.deserialize(jsonObject.get(singleName), type); for (BlockPart blockPart : BlockPart.values()) { @@ -312,7 +313,8 @@ public class BlockFamilyDefinitionFormat extends AbstractAssetFileFormat deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + public Class deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { BlockFamilyLibrary library = CoreRegistry.get(BlockFamilyLibrary.class); return library.getBlockFamily(json.getAsString()); diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockMeshPart.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockMeshPart.java index 9d0167cd0..23ce2f861 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockMeshPart.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockMeshPart.java @@ -79,7 +79,8 @@ public class BlockMeshPart { return new BlockMeshPart(vertices, normals, newTexCoords, indices, frames); } - public void appendTo(ChunkMesh chunk, ChunkView chunkView, int offsetX, int offsetY, int offsetZ, ChunkMesh.RenderType renderType, ChunkVertexFlag flags) { + public void appendTo(ChunkMesh chunk, ChunkView chunkView, int offsetX, int offsetY, int offsetZ, + ChunkMesh.RenderType renderType, ChunkVertexFlag flags) { ChunkMesh.VertexElements elements = chunk.getVertexElements(renderType); for (Vector2f texCoord : texCoords) { elements.uv0.put(texCoord); @@ -93,7 +94,8 @@ public class BlockMeshPart { elements.normals.put(normals[vIdx]); elements.flags.put(flags.getValue()); elements.frames.put(texFrames - 1); - float[] lightingData = calcLightingValuesForVertexPos(chunkView, vertices[vIdx].add(offsetX, offsetY, offsetZ, new Vector3f()), normals[vIdx]); + float[] lightingData = calcLightingValuesForVertexPos(chunkView, vertices[vIdx].add(offsetX, offsetY, offsetZ, + new Vector3f()), normals[vIdx]); elements.sunlight.put(lightingData[0]); elements.blockLight.put(lightingData[1]); elements.ambientOcclusion.put(lightingData[2]); 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 3f2ceed79..1b4a5c01b 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 @@ -96,7 +96,9 @@ public class BlockShapeImpl extends BlockShape { } private Rotation applySymmetry(Rotation rot) { - return Rotation.rotate(yawSymmetric ? Yaw.NONE : rot.getYaw(), pitchSymmetric ? Pitch.NONE : rot.getPitch(), rollSymmetric ? Roll.NONE : rot.getRoll()); + return Rotation.rotate(yawSymmetric ? Yaw.NONE : rot.getYaw(), + pitchSymmetric ? Pitch.NONE : rot.getPitch(), + rollSymmetric ? Roll.NONE : rot.getRoll()); } } diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlasImpl.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlasImpl.java index 0fd68fcd6..f71d07929 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlasImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlasImpl.java @@ -251,7 +251,8 @@ public class WorldAtlasImpl implements WorldAtlas { return createAtlasMipmaps(numMipMaps, initialColor, tileImages, screenshotName, Lists.newArrayList()); } - private ByteBuffer[] createAtlasMipmaps(int numMipMaps, Color initialColor, List tileImages, String screenshotName, List alphaMaskTiles) { + private ByteBuffer[] createAtlasMipmaps(int numMipMaps, Color initialColor, List tileImages, + String screenshotName, List alphaMaskTiles) { ByteBuffer[] data = new ByteBuffer[numMipMaps]; for (int i = 0; i < numMipMaps; ++i) { BufferedImage image = generateAtlas(i, tileImages, initialColor); @@ -261,7 +262,8 @@ public class WorldAtlasImpl implements WorldAtlas { } if (i == 0) { - try (OutputStream stream = new BufferedOutputStream(Files.newOutputStream(PathManager.getInstance().getScreenshotPath().resolve(screenshotName)))) { + try (OutputStream stream = new BufferedOutputStream(Files.newOutputStream( + PathManager.getInstance().getScreenshotPath().resolve(screenshotName)))) { ImageIO.write(image, "png", stream); } catch (IOException e) { logger.warn("Failed to write atlas"); @@ -345,7 +347,8 @@ public class WorldAtlasImpl implements WorldAtlas { for (int frameIndex = 0; frameIndex < tile.getLength(); frameIndex++) { int posX = totalIndex % tilesPerDim; int posY = totalIndex / tilesPerDim; - g.drawImage(tile.getImage(frameIndex).getScaledInstance(textureSize, textureSize, Image.SCALE_SMOOTH), posX * textureSize, posY * textureSize, null); + g.drawImage(tile.getImage(frameIndex).getScaledInstance(textureSize, textureSize, Image.SCALE_SMOOTH), + posX * textureSize, posY * textureSize, null); totalIndex++; } } diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java b/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java index e791555e1..8befbe093 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java @@ -33,7 +33,8 @@ public final class Chunks { public static final Vector3ic CHUNK_POWER = new Vector3i(POWER_X, POWER_Y, POWER_Z); public static final Vector3ic CHUNK_SIZE = new Vector3i(SIZE_X, SIZE_Y, SIZE_Z); - public static final Vector3ic INNER_CHUNK_POS_FILTER = new org.joml.Vector3i(INNER_CHUNK_POS_FILTER_X, INNER_CHUNK_POS_FILTER_Y, INNER_CHUNK_POS_FILTER_Z); + public static final Vector3ic INNER_CHUNK_POS_FILTER = + new org.joml.Vector3i(INNER_CHUNK_POS_FILTER_X, INNER_CHUNK_POS_FILTER_Y, INNER_CHUNK_POS_FILTER_Z); public static final BlockRegionc CHUNK_REGION = new BlockRegion(0, 0, 0).setSize(CHUNK_SIZE); public static final Vector3ic LOCAL_REGION_EXTENTS = new Vector3i(1, 1, 1); @@ -354,7 +355,9 @@ public final class Chunks { * @return dest */ public static Vector3i toRelative(int x, int y, int z, Vector3i dest) { - return dest.set(toRelative(x, INNER_CHUNK_POS_FILTER.x()), toRelative(y, INNER_CHUNK_POS_FILTER.y()), toRelative(z, INNER_CHUNK_POS_FILTER.z())); + return dest.set(toRelative(x, INNER_CHUNK_POS_FILTER.x()), + toRelative(y, INNER_CHUNK_POS_FILTER.y()), + toRelative(z, INNER_CHUNK_POS_FILTER.z())); } //-- checks ------------------------------------------------------------------------------------------------------// diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraArray.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraArray.java index 69a7a4530..a7cdcbe18 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraArray.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraArray.java @@ -43,8 +43,10 @@ public abstract class TeraArray { sizeXZHalf = sizeXZ / 2; sizeXYZ = sizeY * sizeXZ; sizeXYZHalf = sizeXYZ / 2; - checkArgument(getSizeXYZ() % 2 == 0, "The product of the parameters 'sizeX', 'sizeY' and 'sizeZ' has to be a multiple of 2 (" + getSizeXYZ() + ")"); - checkArgument(getSizeXZ() % 2 == 0, "The product of the parameters 'sizeX' and 'sizeZ' has to be a multiple of 2 (" + getSizeXZ() + ")"); + checkArgument(getSizeXYZ() % 2 == 0, "The product of the parameters 'sizeX', 'sizeY' and 'sizeZ' " + + "has to be a multiple of 2 (" + getSizeXYZ() + ")"); + checkArgument(getSizeXZ() % 2 == 0, "The product of the parameters 'sizeX' and 'sizeZ' " + + "has to be a multiple of 2 (" + getSizeXZ() + ")"); if (initialize) { initialize(); } diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray.java index ad366751e..08d8ad3c7 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray.java @@ -28,11 +28,15 @@ public abstract class TeraDenseArray extends TeraArray { public void copyFrom(TeraArray in) { checkNotNull(in); - checkArgument(getSizeX() == in.getSizeX(), "Tera arrays have to be of equal size (this.getSizeX() = " + getSizeX() + ", in.getSizeX() = " + in.getSizeX() + ")"); - checkArgument(getSizeY() == in.getSizeY(), "Tera arrays have to be of equal size (this.getSizeY() = " + getSizeY() + ", in.getSizeY() = " + in.getSizeY() + ")"); - checkArgument(getSizeZ() == in.getSizeZ(), "Tera arrays have to be of equal size (this.getSizeZ() = " + getSizeZ() + ", in.getSizeZ() = " + in.getSizeZ() + ")"); + checkArgument(getSizeX() == in.getSizeX(), + "Tera arrays have to be of equal size (this.getSizeX() = " + getSizeX() + ", in.getSizeX() = " + in.getSizeX() + ")"); + checkArgument(getSizeY() == in.getSizeY(), + "Tera arrays have to be of equal size (this.getSizeY() = " + getSizeY() + ", in.getSizeY() = " + in.getSizeY() + ")"); + checkArgument(getSizeZ() == in.getSizeZ(), + "Tera arrays have to be of equal size (this.getSizeZ() = " + getSizeZ() + ", in.getSizeZ() = " + in.getSizeZ() + ")"); checkArgument(getElementSizeInBits() >= in.getElementSizeInBits(), - "Tera arrays are incompatible (this.getElementSizeInBits() = " + getElementSizeInBits() + ", in.getElementSizeInBits() = " + in.getElementSizeInBits() + ")"); + "Tera arrays are incompatible (this.getElementSizeInBits() = " + getElementSizeInBits() + + ", in.getElementSizeInBits() = " + in.getElementSizeInBits() + ")"); for (int y = 0; y < getSizeY(); y++) { for (int x = 0; x < getSizeX(); x++) { for (int z = 0; z < getSizeZ(); z++) { diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray16Bit.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray16Bit.java index 9ac0ee5cf..53d18a408 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray16Bit.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArray16Bit.java @@ -29,7 +29,8 @@ public class TeraDenseArray16Bit extends TeraDenseArray { public TeraDenseArray16Bit(int sizeX, int sizeY, int sizeZ, short[] data) { super(sizeX, sizeY, sizeZ, false); this.data = Preconditions.checkNotNull(data); - Preconditions.checkArgument(data.length == getSizeXYZ(), "The length of parameter 'data' has to be " + getSizeXYZ() + " but is " + data.length); + Preconditions.checkArgument(data.length == getSizeXYZ(), + "The length of parameter 'data' has to be " + getSizeXYZ() + " but is " + data.length); } public TeraDenseArray16Bit(TeraArray in) { diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArrayByte.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArrayByte.java index 9125c26fc..d87946e72 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArrayByte.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraDenseArrayByte.java @@ -27,7 +27,8 @@ public abstract class TeraDenseArrayByte extends TeraDenseArray { protected TeraDenseArrayByte(int sizeX, int sizeY, int sizeZ, byte[] data) { super(sizeX, sizeY, sizeZ, false); this.data = Preconditions.checkNotNull(data); - Preconditions.checkArgument(data.length == dataSize(), "The length of the parameter 'data' has to be " + dataSize() + " but is " + data.length); + Preconditions.checkArgument(data.length == dataSize(), + "The length of the parameter 'data' has to be " + dataSize() + " but is " + data.length); } protected TeraDenseArrayByte(TeraArray in) { diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraSparseArray16Bit.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraSparseArray16Bit.java index de3169213..df8820550 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraSparseArray16Bit.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/TeraSparseArray16Bit.java @@ -34,8 +34,10 @@ public class TeraSparseArray16Bit extends TeraSparseArray { super(sizeX, sizeY, sizeZ, false); this.inflated = Preconditions.checkNotNull(inflated); this.deflated = Preconditions.checkNotNull(deflated); - Preconditions.checkArgument(inflated.length == sizeY, "The length of parameter 'inflated' has to be " + sizeY + " but is " + inflated.length); - Preconditions.checkArgument(deflated.length == sizeY, "The length of parameter 'deflated' has to be " + sizeY + " but is " + deflated.length); + Preconditions.checkArgument(inflated.length == sizeY, + "The length of parameter 'inflated' has to be " + sizeY + " but is " + inflated.length); + Preconditions.checkArgument(deflated.length == sizeY, + "The length of parameter 'deflated' has to be " + sizeY + " but is " + deflated.length); } public TeraSparseArray16Bit(int sizeX, int sizeY, int sizeZ, short fill) { @@ -66,7 +68,8 @@ public class TeraSparseArray16Bit extends TeraSparseArray { @Override public TeraArray deflate(TeraVisitingDeflator deflator) { - return Preconditions.checkNotNull(deflator).deflateSparseArray16Bit(inflated, deflated, fill, getSizeXZ(), getSizeX(), getSizeY(), getSizeZ()); + return Preconditions.checkNotNull(deflator) + .deflateSparseArray16Bit(inflated, deflated, fill, getSizeXZ(), getSizeX(), getSizeY(), getSizeZ()); } @Override diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProvider.java b/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProvider.java index 7725e635c..7b31d0643 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProvider.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProvider.java @@ -147,7 +147,9 @@ public class LocalChunkProvider implements ChunkProvider { Chunk[] chunks = new Chunk[region.volume()]; for (Vector3ic chunkPos : region) { Chunk chunk = chunkCache.get(chunkPos); - int index = (chunkPos.x() - region.minX()) + region.getSizeX() * ((chunkPos.z() - region.minZ()) + region.getSizeZ() * (chunkPos.y() - region.minY())); + int index = (chunkPos.x() - region.minX()) + region.getSizeX() + * ((chunkPos.z() - region.minZ()) + region.getSizeZ() + * (chunkPos.y() - region.minY())); chunks[index] = chunk; } return new ChunkViewCoreImpl(chunks, region, offset, blockManager.getBlock(BlockManager.AIR_ID)); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/remoteChunkProvider/RemoteChunkProvider.java b/engine/src/main/java/org/terasology/engine/world/chunks/remoteChunkProvider/RemoteChunkProvider.java index 0f1692fd2..71eb4e376 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/remoteChunkProvider/RemoteChunkProvider.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/remoteChunkProvider/RemoteChunkProvider.java @@ -186,7 +186,9 @@ public class RemoteChunkProvider implements ChunkProvider { Chunk[] chunks = new Chunk[region.getSizeX() * region.getSizeY() * region.getSizeZ()]; for (Vector3ic chunkPos : region) { Chunk chunk = chunkCache.get(chunkPos); - int index = (chunkPos.x() - region.minX()) + region.getSizeX() * ((chunkPos.z() - region.minZ()) + region.getSizeZ() * (chunkPos.y() - region.minY())); + int index = (chunkPos.x() - region.minX()) + region.getSizeX() + * ((chunkPos.z() - region.minZ()) + region.getSizeZ() + * (chunkPos.y() - region.minY())); chunks[index] = chunk; } return new ChunkViewCoreImpl(chunks, region, offset, blockManager.getBlock(BlockManager.AIR_ID)); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Border3D.java b/engine/src/main/java/org/terasology/engine/world/generation/Border3D.java index 9d56d8db3..ad61909ff 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Border3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Border3D.java @@ -114,8 +114,8 @@ public class Border3D { } /** - * Returns a new border, using the largest value of each extension for both borders. Border A(Sides=5,Bottom=4,Top=3) maxed with border B (Sides=3,Bottom=4,Top=5) - * would make a border C with boundries: (5,4,5). + * Returns a new border, using the largest value of each extension for both borders. + * Border A(Sides=5,Bottom=4,Top=3) maxed with border B (Sides=3,Bottom=4,Top=5) would make a border C with boundries: (5,4,5). * @param other The top value to compare with the instance's top value. * @return The resulting new Border3D. */ @@ -131,8 +131,8 @@ public class Border3D { } /** - * Checks if the fields of the instance are the same as the object passed in the parameters. It compares the size of the Border3D and returns true of all sizes are the - * same. + * Checks if the fields of the instance are the same as the object passed in the parameters. + * It compares the size of the Border3D and returns true of all sizes are the same. */ @Override public boolean equals(Object obj) { 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 2c58f40f7..a3da4db84 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 @@ -254,7 +254,8 @@ public class WorldBuilder extends ProviderStore { } // then add all @Updates facet providers - providersList.stream().filter(provider -> updatesFacet(provider, facet) && (!scalable || provider instanceof ScalableFacetProvider)).forEach(provider -> { + providersList.stream().filter(provider -> updatesFacet(provider, facet) + && (!scalable || provider instanceof ScalableFacetProvider)).forEach(provider -> { Set localOrderedProviders = Sets.newLinkedHashSet(); // add all required facets for updating provider for (Facet requirement : requiredFacets(provider)) { @@ -326,7 +327,8 @@ public class WorldBuilder extends ProviderStore { // Ensure that rasterizers that must run after others are in the correct order. This ensures that blocks from // the dependent raterizer are not being overwritten by any antecedent rasterizer. // TODO: This will only handle first-order dependencies and does not check for circular dependencies - private List ensureRasterizerOrdering(ListMultimap, FacetProvider> providerChains, boolean scalable) { + private List ensureRasterizerOrdering(ListMultimap, + FacetProvider> providerChains, boolean scalable) { List orderedRasterizers = Lists.newArrayList(); Set> addedRasterizers = new HashSet<>(); 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 3b0ba0cea..cad4aa371 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 @@ -30,15 +30,19 @@ public class BaseFacet3D implements WorldFacet3D { protected final int getRelativeIndex(int x, int y, int z) { if (!relativeRegion.contains(x, y, z)) { - throw new IllegalArgumentException(String.format("Out of bounds: (%d, %d, %d) for region %s", x, y, z, relativeRegion.toString())); + throw new IllegalArgumentException( + String.format("Out of bounds: (%d, %d, %d) for region %s", x, y, z, relativeRegion.toString())); } - return x - relativeRegion.minX() + relativeRegion.getSizeX() * (y - relativeRegion.minY() + relativeRegion.getSizeY() * (z - relativeRegion.minZ())); + return x - relativeRegion.minX() + + relativeRegion.getSizeX() * (y - relativeRegion.minY() + relativeRegion.getSizeY() * (z - relativeRegion.minZ())); } protected final int getWorldIndex(int x, int y, int z) { if (!worldRegion.contains(x, y, z)) { - throw new IllegalArgumentException(String.format("Out of bounds: (%d, %d, %d) for region %s", x, y, z, worldRegion.toString())); + throw new IllegalArgumentException( + String.format("Out of bounds: (%d, %d, %d) for region %s", x, y, z, worldRegion.toString())); } - return x - worldRegion.minX() + worldRegion.getSizeX() * (y - worldRegion.minY() + worldRegion.getSizeY() * (z - worldRegion.minZ())); + return x - worldRegion.minX() + + worldRegion.getSizeX() * (y - worldRegion.minY() + worldRegion.getSizeY() * (z - worldRegion.minZ())); } } 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 25c2c6452..da7dea640 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 @@ -54,8 +54,8 @@ public class WorldGeneratorManager { SimpleUri uri = new SimpleUri(moduleId, annotation.id()); infos.add(new WorldGeneratorInfo(uri, annotation.displayName(), annotation.description())); } else { - logger.error("{} marked to be registered as a World Generator, but is not a subclass of WorldGenerator or lacks the correct constructor", - generatorClass); + logger.error("{} marked to be registered as a World Generator, " + + "but is not a subclass of WorldGenerator or lacks the correct constructor", generatorClass); } } } @@ -96,9 +96,11 @@ public class WorldGeneratorManager { ResolutionResult result = resolver.resolve(uri.getModuleName()); if (!result.isSuccess()) { if (moduleManager.getRegistry().getLatestModuleVersion(uri.getModuleName()) == null) { - throw new UnresolvedWorldGeneratorException("Unable to resolve world generator '" + uri + "' - not found"); + throw new UnresolvedWorldGeneratorException("Unable to resolve world generator '" + + uri + "' - not found"); } else { - throw new UnresolvedWorldGeneratorException("Unable to resolve world generator '" + uri + "' - unable to resolve module dependencies"); + throw new UnresolvedWorldGeneratorException("Unable to resolve world generator '" + + uri + "' - unable to resolve module dependencies"); } } try (ModuleEnvironment environment = moduleManager.loadEnvironment(result.getModules(), false)) { @@ -115,7 +117,8 @@ public class WorldGeneratorManager { * @param environment to be searched for the world generator class. * @return a new world generator with the specified uri. */ - public static WorldGenerator createWorldGenerator(SimpleUri uri, Context context, ModuleEnvironment environment) throws UnresolvedWorldGeneratorException { + public static WorldGenerator createWorldGenerator(SimpleUri uri, Context context, ModuleEnvironment environment) + throws UnresolvedWorldGeneratorException { for (Class generatorClass : environment.getTypesAnnotatedWith(RegisterWorldGenerator.class)) { RegisterWorldGenerator annotation = generatorClass.getAnnotation(RegisterWorldGenerator.class); Name moduleName = environment.getModuleProviding(generatorClass); @@ -152,7 +155,8 @@ public class WorldGeneratorManager { } } return false; - // Being generous in catching here, because if the module is broken due to code changes or missing classes the world generator is invalid + // Being generous in catching here, because if the module is broken due to code changes or missing classes + // the world generator is invalid } catch (NoSuchMethodException | RuntimeException e) { return false; } 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 10ef092fe..9dfbd4d58 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 @@ -32,7 +32,9 @@ public class DefaultWorldGeneratorPluginLibrary implements WorldGeneratorPluginL public List instantiateAllOfType(Class ofType) { List result = Lists.newArrayList(); for (ClassMetadata classMetadata : library) { - if (ofType.isAssignableFrom(classMetadata.getType()) && classMetadata.isConstructable() && classMetadata.getType().getAnnotation(RegisterPlugin.class) != null) { + if (ofType.isAssignableFrom(classMetadata.getType()) + && classMetadata.isConstructable() + && classMetadata.getType().getAnnotation(RegisterPlugin.class) != null) { U item = ofType.cast(classMetadata.newInstance()); if (item != null) { result.add(item); diff --git a/engine/src/main/java/org/terasology/engine/world/internal/EntityAwareWorldProvider.java b/engine/src/main/java/org/terasology/engine/world/internal/EntityAwareWorldProvider.java index 6d32738ac..6efb89a57 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/EntityAwareWorldProvider.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/EntityAwareWorldProvider.java @@ -52,7 +52,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -public class EntityAwareWorldProvider extends AbstractWorldProviderDecorator implements BlockEntityRegistry, UpdateSubscriberSystem, EntityChangeSubscriber { +public class EntityAwareWorldProvider extends AbstractWorldProviderDecorator + implements BlockEntityRegistry, UpdateSubscriberSystem, EntityChangeSubscriber { private static final Logger logger = LoggerFactory.getLogger(EntityAwareWorldProvider.class); private static final Set> COMMON_BLOCK_COMPONENTS = ImmutableSet.of(NetworkComponent.class, BlockComponent.class, LocationComponent.class); @@ -164,7 +165,9 @@ public class EntityAwareWorldProvider extends AbstractWorldProviderDecorator imp } else if (oldType.isKeepActive() && isTemporaryBlock(blockEntity, type)) { temporaryBlockEntities.add(blockEntity); } - if (forceEntityUpdate || !(Objects.equal(oldType.getBlockFamily(), type.getBlockFamily()) && Objects.equal(oldType.getPrefab(), type.getPrefab()))) { + if (forceEntityUpdate + || !(Objects.equal(oldType.getBlockFamily(), type.getBlockFamily()) + && Objects.equal(oldType.getPrefab(), type.getPrefab()))) { updateBlockEntityComponents(blockEntity, oldType, type, retainComponents); } @@ -221,7 +224,9 @@ public class EntityAwareWorldProvider extends AbstractWorldProviderDecorator imp public EntityRef getBlockEntityAt(Vector3ic blockPosition) { if (GameThread.isCurrentThread()) { EntityRef blockEntity = getExistingBlockEntityAt(blockPosition); - if ((!blockEntity.exists() || !blockEntity.hasComponent(NetworkComponent.class)) && isBlockRelevant(blockPosition.x(), blockPosition.y(), blockPosition.z())) { + if ((!blockEntity.exists() + || !blockEntity.hasComponent(NetworkComponent.class)) + && isBlockRelevant(blockPosition.x(), blockPosition.y(), blockPosition.z())) { Block block = getBlock(blockPosition.x(), blockPosition.y(), blockPosition.z()); blockEntity = createBlockEntity(blockPosition, block); } diff --git a/engine/src/main/java/org/terasology/engine/world/propagation/BatchPropagator.java b/engine/src/main/java/org/terasology/engine/world/propagation/BatchPropagator.java index 40a6d691b..858c1ee32 100644 --- a/engine/src/main/java/org/terasology/engine/world/propagation/BatchPropagator.java +++ b/engine/src/main/java/org/terasology/engine/world/propagation/BatchPropagator.java @@ -96,14 +96,16 @@ public interface BatchPropagator { // x == 0 target[y * dimX] = Math.min(source[dimX * (y - 1)], Math.min(source[dimX * (y + 1)], source[1 + dimX * y])); // x == dimX - 1 - target[dimX - 1 + y * dimX] = Math.min(source[dimX - 1 + dimX * (y - 1)], Math.min(source[dimX - 1 + dimX * (y + 1)], source[dimX - 2 + dimX * y])); + target[dimX - 1 + y * dimX] = Math.min(source[dimX - 1 + dimX * (y - 1)], + Math.min(source[dimX - 1 + dimX * (y + 1)], source[dimX - 2 + dimX * y])); } // x == 0, y == dimY - 1 target[dimX * (dimY - 1)] = Math.min(source[1 + dimX * (dimY - 1)], source[dimX * (dimY - 2)]); // 0 < x < dimX - 1; y == dimY - 1 for (int x = 1; x < dimX - 1; ++x) { - target[x + dimX * (dimY - 1)] = Math.min(source[x - 1 + dimX * (dimY - 1)], Math.min(source[x + 1 + dimX * (dimY - 1)], source[x + dimX * (dimY - 2)])); + target[x + dimX * (dimY - 1)] = Math.min(source[x - 1 + dimX * (dimY - 1)], + Math.min(source[x + 1 + dimX * (dimY - 1)], source[x + dimX * (dimY - 2)])); } // x == dimX - 1; y == dimY - 1 diff --git a/engine/src/main/java/org/terasology/engine/world/propagation/SunlightRegenBatchPropagator.java b/engine/src/main/java/org/terasology/engine/world/propagation/SunlightRegenBatchPropagator.java index 4f4babde0..37befcdb9 100644 --- a/engine/src/main/java/org/terasology/engine/world/propagation/SunlightRegenBatchPropagator.java +++ b/engine/src/main/java/org/terasology/engine/world/propagation/SunlightRegenBatchPropagator.java @@ -27,7 +27,8 @@ public class SunlightRegenBatchPropagator implements BatchPropagator { private Set[] reduceQueues; private Set[] increaseQueues; - public SunlightRegenBatchPropagator(PropagationRules regenRules, PropagatorWorldView regenWorld, BatchPropagator sunlightPropagator, PropagatorWorldView sunlightWorld) { + public SunlightRegenBatchPropagator(PropagationRules regenRules, PropagatorWorldView regenWorld, + BatchPropagator sunlightPropagator, PropagatorWorldView sunlightWorld) { this.regenRules = regenRules; this.regenWorld = regenWorld; this.sunlightPropagator = sunlightPropagator; diff --git a/facades/PC/src/main/java/org/terasology/engine/Terasology.java b/facades/PC/src/main/java/org/terasology/engine/Terasology.java index 30bcf5270..1172a2951 100644 --- a/facades/PC/src/main/java/org/terasology/engine/Terasology.java +++ b/facades/PC/src/main/java/org/terasology/engine/Terasology.java @@ -239,7 +239,8 @@ public final class Terasology { System.out.println(); System.out.println(" terasology" + optText.toString()); System.out.println(); - System.out.println("By default Terasology saves data such as game saves and logs into subfolders of a platform-specific \"home directory\"."); + System.out.println("By default Terasology saves data such as game saves and logs into subfolders of a platform-specific \"home " + + "directory\"."); System.out.println("Saving can be explicitly disabled using the \"" + NO_SAVE_GAMES + "\" flag."); System.out.println("Optionally, the user can override the default by using one of the following launch arguments:"); System.out.println(); @@ -264,7 +265,8 @@ public final class Terasology { System.out.println(); System.out.println("To change the port the server is hosted on use the " + SERVER_PORT + " launch argument."); System.out.println(); - System.out.println("To override the default generated config (useful for headless server) use the " + OVERRIDE_DEFAULT_CONFIG + " launch argument"); + System.out.println("To override the default generated config (useful for headless server) use the " + OVERRIDE_DEFAULT_CONFIG + + " launch argument"); System.out.println(); System.out.println("Examples:"); System.out.println(); 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 9165b0853..62b9487ab 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 @@ -31,8 +31,10 @@ public class ReflectionProvider implements PropertyProvider { try { ReflectFactory reflectFactory = context.get(ReflectFactory.class); CopyStrategyLibrary copyStrategies = context.get(CopyStrategyLibrary.class); - ClassMetadata classMetadata = new DefaultClassMetadata<>("engine:empty", (Class) target.getClass(), reflectFactory, copyStrategies); - for (Field field : getAllFields(target.getClass(), and(withAnnotation(Range.class), or(withType(Float.TYPE), withType(Float.class))))) { + ClassMetadata classMetadata = new DefaultClassMetadata<>("engine:empty", (Class) target.getClass(), + reflectFactory, copyStrategies); + for (Field field : getAllFields(target.getClass(), + and(withAnnotation(Range.class), or(withType(Float.TYPE), withType(Float.class))))) { Range range = field.getAnnotation(Range.class); FieldMetadata fieldMetadata = (FieldMetadata) classMetadata.getField(field.getName()); Property property = new FloatProperty(target, fieldMetadata, range.min(), range.max()); 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 45b677a15..9fb88f2b8 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 @@ -6,8 +6,9 @@ package org.terasology.subsystem.discordrpc; import java.time.OffsetDateTime; /** - * A threaded-safe shared buffer used to store information for {@link DiscordRPCThread} to be processed as {@link com.jagrosh.discordipc.entities.RichPresence} - * + * A threaded-safe shared buffer used to store information for {@link DiscordRPCThread} to be processed as {@link + * com.jagrosh.discordipc.entities.RichPresence} + *

* It helps avoiding allocating unnecessary objects for the rich presence. */ public final class DiscordRPCBuffer { 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 bf5262cc6..8b9e870b1 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 @@ -24,8 +24,8 @@ import org.terasology.engine.registry.In; import java.time.OffsetDateTime; /** - * It's a system that runs when a single player or multi player game has been started to process some stuff throw the - * {@link DiscordRPCSubSystem}. + * It's a system that runs when a single player or multi player game has been started to process some stuff throw the {@link + * DiscordRPCSubSystem}. * * @see DiscordRPCSubSystem */ @@ -87,7 +87,7 @@ public final class DiscordRPCSystem extends BaseComponentSystem { } /** - * Adds the periodic action when the player is hosting or playing online to update party size + * Adds the periodic action when the player is hosting or playing online to update party size */ @ReceiveEvent public void onPlayerInitialized(LocalPlayerInitializedEvent event, EntityRef localPlayer) { @@ -98,7 +98,8 @@ public final class DiscordRPCSystem extends BaseComponentSystem { if (mode.isAuthority()) { delayManager.addPeriodicAction(localPlayer, UPDATE_PARTY_SIZE_ID, 0, UPDATE_PARTY_SIZE_PERIOD); } else { - logger.warn("The 'DelayManager' is not available on non-authority system. Not scheduling '{}' periodic action. See #4742.", UPDATE_PARTY_SIZE_ID); + logger.warn("The 'DelayManager' is not available on non-authority system. Not scheduling '{}' periodic action. " + + "See #4742.", UPDATE_PARTY_SIZE_ID); } } } 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 6bedaa118..d57a5e366 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 @@ -12,8 +12,8 @@ public interface InstanceCreator { /** * This method is called during deserialization to create an instance of the * specified type. The fields of the returned instance are overwritten with the deserialized data. - * Since the prior contents of the object are destroyed and overwritten, always return different instances. In particular, do not return a common instance, - * always use {@code new} to create a new instance. + * Since the prior contents of the object are destroyed and overwritten, always return different instances. + * In particular, do not return a common instance, always use {@code new} to create a new instance. * * @param type the parameterized type {@link T} represented as a {@link Type}. * @return a default object instance of type {@link T}.