diff --git a/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java b/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java index 6838a203c39..bcbff1e32df 100644 --- a/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java +++ b/engine-tests/src/main/java/org/terasology/engine/MapWorldProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine; import com.google.common.collect.Maps; diff --git a/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java b/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java index 2f0f998155b..46f6353bba2 100644 --- a/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java +++ b/engine-tests/src/main/java/org/terasology/engine/TerasologyTestingEnvironment.java @@ -43,7 +43,6 @@ /** * A base class for unit test classes to inherit to run in a Terasology environment - with LWJGL set up and so forth - * */ public abstract class TerasologyTestingEnvironment { private static final Logger logger = LoggerFactory.getLogger(TerasologyTestingEnvironment.class); @@ -60,7 +59,7 @@ public abstract class TerasologyTestingEnvironment { @BeforeAll public static void setupEnvironment(@TempDir Path tempHome) throws Exception { PathManager.getInstance().useOverrideHomePath(tempHome); - Bullet.init(true,false); + Bullet.init(true, false); /* * Create at least for each class a new headless environment as it is fast and prevents side effects @@ -95,12 +94,15 @@ public void setup() throws Exception { context.put(CharacterStateEventPositionMap.class, characterStateEventPositionMap); DirectionAndOriginPosRecorderList directionAndOriginPosRecorderList = new DirectionAndOriginPosRecorderList(); context.put(DirectionAndOriginPosRecorderList.class, directionAndOriginPosRecorderList); - RecordAndReplaySerializer recordAndReplaySerializer = new RecordAndReplaySerializer(engineEntityManager, recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); + RecordAndReplaySerializer recordAndReplaySerializer = new RecordAndReplaySerializer(engineEntityManager, + recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, + directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); context.put(RecordAndReplaySerializer.class, recordAndReplaySerializer); Path savePath = PathManager.getInstance().getSavePath("world1"); context.put(StorageManager.class, new ReadWriteStorageManager(savePath, moduleManager.getEnvironment(), - engineEntityManager, mockBlockManager, extraDataManager, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus)); + engineEntityManager, mockBlockManager, extraDataManager, recordAndReplaySerializer, + recordAndReplayUtils, recordAndReplayCurrentStatus)); ComponentSystemManager componentSystemManager = new ComponentSystemManager(context); context.put(ComponentSystemManager.class, componentSystemManager); diff --git a/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java b/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java index 61452547de9..7ce3505fc4c 100644 --- a/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java +++ b/engine-tests/src/main/java/org/terasology/engine/WorldProvidingHeadlessEnvironment.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine; import org.terasology.gestalt.naming.Name; diff --git a/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java b/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java index ac421d25944..b2b3a2e113d 100644 --- a/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java +++ b/engine-tests/src/main/java/org/terasology/engine/config/flexible/TestAutoConfig.java @@ -17,7 +17,7 @@ public class TestAutoConfig extends AutoConfig { ); public final Setting> integerListSetting = setting( - type(new TypeInfo>() {}), + type(new TypeInfo>() { }), defaultValue(ImmutableList.of()) ); diff --git a/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java b/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java index d761fb18f22..77eadc8a3d4 100644 --- a/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java +++ b/engine-tests/src/main/java/org/terasology/engine/testUtil/WorldProviderCoreStub.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.testUtil; @@ -34,8 +21,6 @@ import java.util.Collections; import java.util.Map; -/** - */ public class WorldProviderCoreStub implements WorldProviderCore { private Map blocks = Maps.newHashMap(); diff --git a/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java b/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java index 206a7657a75..d20ef697682 100644 --- a/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java +++ b/engine-tests/src/main/java/org/terasology/engine/world/propagation/StubPropagatorWorldView.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.propagation; import com.google.common.collect.Maps; @@ -26,8 +13,6 @@ import java.util.Map; -/** - */ public class StubPropagatorWorldView implements PropagatorWorldView { private TObjectByteMap lightData = new TObjectByteHashMap<>(); private Map blockData = Maps.newHashMap(); diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java index d15325be9cf..ace5c103a89 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/EntityRefComponent.java @@ -5,8 +5,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; -/** - */ public class EntityRefComponent implements Component { public EntityRef entityRef = EntityRef.NULL; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java index 97568be510d..d34cc469307 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/ForceBlockActiveComponent.java @@ -5,8 +5,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.world.block.ForceBlockActive; -/** - */ @ForceBlockActive public class ForceBlockActiveComponent implements Component { } diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java index ac80ec08883..87d18b87153 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/GetterSetterComponent.java @@ -5,8 +5,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; -/** - */ public class GetterSetterComponent implements Component { public transient boolean getterUsed; public transient boolean setterUsed; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java index 83e7e35ee7f..a2341a8b876 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/IntegerComponent.java @@ -4,8 +4,6 @@ import org.terasology.engine.entitySystem.Component; -/** - */ public final class IntegerComponent implements Component { public int value; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java index b149b2cb0a8..471cb68daf4 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/MappedTypeComponent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.reflection.MappedContainer; -/** - */ public class MappedTypeComponent implements Component { public InnerType val = new InnerType(); diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java index d5e670de38f..ebbf65ca5cf 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/OwnerComponent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.Owns; import org.terasology.engine.entitySystem.entity.EntityRef; -/** - */ public class OwnerComponent implements Component { @Owns public EntityRef child = EntityRef.NULL; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java index b11a9498a1c..9fc1ea6d891 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/RetainedOnBlockChangeComponent.java @@ -5,8 +5,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.world.block.ForceBlockActive; -/** - */ @ForceBlockActive(retainUnalteredOnBlockChange = true) public class RetainedOnBlockChangeComponent implements Component { public int value; diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java index 330c97fbd39..ff519f3702a 100644 --- a/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java +++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/UnsupportedTypeComponent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.systems.internal.DoNotAutoRegister; -/** - */ @DoNotAutoRegister public class UnsupportedTypeComponent implements Component { public UnsupportedType value; diff --git a/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java b/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java index 5f4e81e7c46..1499001fe35 100644 --- a/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java +++ b/engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; import com.google.common.collect.ImmutableList; @@ -50,7 +37,7 @@ public void testGetSettingFieldsIn() { ); assertEquals( - Sets.newHashSet(new TypeInfo>() {}, new TypeInfo>>() {}), + Sets.newHashSet(new TypeInfo>() { }, new TypeInfo>>() { }), settingFields.stream().map(Field::getGenericType).map(TypeInfo::of).collect(Collectors.toSet()) ); } diff --git a/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java b/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java index 863e87a2a16..d1f6c936baa 100644 --- a/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java +++ b/engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible.constraints; import org.junit.jupiter.api.Nested; diff --git a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java index 880a5a83538..ebf747c7d95 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java +++ b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation; import com.google.common.collect.Multimaps; diff --git a/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java b/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java index 62c92e7553b..fe67aaac9a0 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java +++ b/engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation; import com.google.common.collect.ArrayListMultimap; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java index dada13f02e2..d1f531c98ee 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiComparator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java index ed95617040b..16f6cfe54d2 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/ApiSaver.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper; import java.io.BufferedWriter; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java index 96812acd58b..5327bd3c8ad 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper; import com.google.common.collect.Multimap; diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java index 26bcbdc8858..d9da4eb4de0 100644 --- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java +++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/util/ApiMethod.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.documentation.apiScraper.util; diff --git a/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java b/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java index c8997599529..551032a5033 100644 --- a/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine; import ch.qos.logback.classic.Level; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java index cf14a997f57..0419bef7b4c 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEntityManagerTest.java @@ -52,8 +52,6 @@ import static org.mockito.Mockito.when; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK; -/** - */ public class PojoEntityManagerTest { private static Context context; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java index d8a9c0e45ca..e26a406816b 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java @@ -31,8 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class PojoEventSystemTests { ComponentLibrary compLibrary; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java index cabe26bd889..446685f2a05 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoPrefabManagerTest.java @@ -23,8 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -/** - */ public class PojoPrefabManagerTest { public static final String PREFAB_NAME = "unittest:myprefab"; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java index 81b3b585b74..00fc3d99cee 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/PrefabTest.java @@ -44,8 +44,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class PrefabTest { private static final Logger logger = LoggerFactory.getLogger(PrefabTest.class); diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java index 6908509348f..c254865f992 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/ComponentMetadataTest.java @@ -19,8 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ComponentMetadataTest { private Context context; diff --git a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java index addcfaddd94..640abac3c6a 100644 --- a/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/entitySystem/metadata/FieldMetadataTest.java @@ -4,15 +4,13 @@ import org.junit.jupiter.api.Test; import org.terasology.gestalt.assets.ResourceUrn; -import org.terasology.unittest.stubs.OwnerComponent; import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.reflect.ReflectFactory; import org.terasology.reflection.reflect.ReflectionReflectFactory; +import org.terasology.unittest.stubs.OwnerComponent; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class FieldMetadataTest { private ReflectFactory factory = new ReflectionReflectFactory(); @@ -28,7 +26,8 @@ public void testOwnsAnnotationProcessed() throws NoSuchMethodException { @Test public void testOwnsAnnotationCollectionProcessed() throws NoSuchMethodException { ComponentMetadata classMetadata = - new ComponentMetadata<>(new ResourceUrn("unittest:OwnedCollectionComponent"), org.terasology.engine.entitySystem.metadata.OwnedCollectionComponent.class, factory, copyStrategyLibrary); + new ComponentMetadata<>(new ResourceUrn("unittest:OwnedCollectionComponent"), + org.terasology.engine.entitySystem.metadata.OwnedCollectionComponent.class, factory, copyStrategyLibrary); ComponentFieldMetadata metadata = classMetadata.getField("items"); assertTrue(metadata.isOwnedReference()); } diff --git a/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java b/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java index 13f41190c19..525d89d6601 100644 --- a/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/network/internal/NetworkOwnershipTest.java @@ -28,8 +28,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - */ @Tag("TteTest") public class NetworkOwnershipTest extends TerasologyTestingEnvironment { diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java index 8ba875933c1..2c74a707e9a 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/ComponentSerializerTest.java @@ -38,8 +38,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class ComponentSerializerTest { private static ModuleManager moduleManager; private ComponentSerializer componentSerializer; diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java index 0499c73b92d..69cadca0085 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/EntitySerializerTest.java @@ -46,8 +46,6 @@ import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL; -/** - */ public class EntitySerializerTest { private static Context context; diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java index 4ae7ee1393c..3a4d5e81904 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/TypeSerializerTest.java @@ -44,11 +44,11 @@ class TypeSerializerTest extends ModuleEnvironmentTest { static { INSTANCE.list.addAll(Lists.newArrayList(50, 51, -52, -53)); - INSTANCE.animals.add(new Dog<>(1, new Vector3f(3.15f, 54.51f, -0.001f), new org.joml.Vector3f(10.0f,30.0f,-0.001f))); + INSTANCE.animals.add(new Dog<>(1, new Vector3f(3.15f, 54.51f, -0.001f), new org.joml.Vector3f(10.0f, 30.0f, -0.001f))); INSTANCE.animals.add(new Cheetah<>(2, Color.MAGENTA)); - INSTANCE.singleAnimal = new Dog<>(2, new Vector3f(4, 5, 6), new org.joml.Vector3f(4,5.8f,8)); + INSTANCE.singleAnimal = new Dog<>(2, new Vector3f(4, 5, 6), new org.joml.Vector3f(4, 5.8f, 8)); } private TypeHandlerLibrary typeHandlerLibrary; @@ -81,7 +81,7 @@ void testJsonSerialize() { @Test void testDeserialize() { Optional> deserialize = gsonSerializer.deserialize( - new TypeInfo>() {}, + new TypeInfo>() { }, INSTANCE_JSON.getBytes(TerasologyConstants.CHARSET)); assertTrue(deserialize.isPresent()); @@ -98,7 +98,7 @@ void testJsonSerializeDeserialize() throws IOException { //noinspection unchecked,OptionalGetWithoutIsPresent,OptionalGetWithoutIsPresent SomeClass deserializedInstance = - (SomeClass) gsonSerializer.deserialize(new TypeInfo>() {}, bytes) + (SomeClass) gsonSerializer.deserialize(new TypeInfo>() { }, bytes) .get(); assertNotEmpty(typeHandlerLibrary.getTypeHandler(Animal.class)); @@ -130,9 +130,9 @@ public boolean equals(Object o) { return false; } SomeClass someClass = (SomeClass) o; - return Objects.equals(data, someClass.data) && - Objects.equals(list, someClass.list) && - Objects.equals(animals, someClass.animals); + return Objects.equals(data, someClass.data) + && Objects.equals(list, someClass.list) + && Objects.equals(animals, someClass.animals); } @Override diff --git a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java index 6df99c4ceae..b982fb4cee1 100644 --- a/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/engine/persistence/serializers/VectorTypeSerializerTest.java @@ -21,8 +21,6 @@ import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.reflection.TypeInfo; -import java.io.IOException; - import static org.terasology.joml.test.VectorAssert.assertEquals; @SuppressWarnings("FieldCanBeLocal") diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java index 450b6fea28e..97758cf188e 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java index 55644eb8569..18d5bdd056a 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java @@ -25,8 +25,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class OwnershipHelperTest { private static ModuleManager moduleManager; @@ -41,7 +39,7 @@ public static void setupClass() throws Exception { @BeforeEach public void setup() { ContextImpl context = new ContextImpl(); - context.put( ModuleManager.class, moduleManager); + context.put(ModuleManager.class, moduleManager); NetworkSystem networkSystem = mock(NetworkSystem.class); when(networkSystem.getMode()).thenReturn(NetworkMode.NONE); context.put(NetworkSystem.class, networkSystem); diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java index 94d7ea3f28a..36070ff0fab 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; @@ -29,8 +29,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - */ public class PojoEntityPoolTest { private PojoEntityPool pool; diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java index bd620c56922..b225fa94865 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java index 84e7e6499bf..5982ad4941b 100644 --- a/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java +++ b/engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata.internal; import org.junit.jupiter.api.BeforeEach; @@ -28,8 +15,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class MetadataBuilderTest { private ReflectFactory factory = new ReflectionReflectFactory(); diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java b/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java index f8e947e8108..fdbb91d2469 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java b/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java index 0b4dbaa1a3a..814f0141c56 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java b/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java index cc9069a9f18..c3841a8628f 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java b/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java index a69fad1c2f9..5c2cee3dc44 100644 --- a/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java +++ b/engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.fixtures; diff --git a/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java b/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java index d04ac2a42e7..49eb8c853e8 100644 --- a/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java +++ b/engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java @@ -92,7 +92,7 @@ public void testDataGenGerman() throws IOException, InvalidAssetFilenameExceptio } @Test - public void testMultiLine() throws IOException, InvalidAssetFilenameException{ + public void testMultiLine() throws IOException, InvalidAssetFilenameException { byte[] resource = createSimpleMultiLineTranslationFile().getBytes(StandardCharsets.UTF_8); AssetDataFile assetDataFile = mockAssetDataFile("game.lang", resource); ResourceUrn urn = createUrnFromFile(format, assetDataFile); @@ -115,7 +115,7 @@ private static ResourceUrn createUrnFromFile(FileFormat format, AssetDataFile fi return new ResourceUrn("engine:" + assetName.toString()); } - private static String createSimpleMultiLineTranslationFile(){ + private static String createSimpleMultiLineTranslationFile() { StringBuilder sb = new StringBuilder(); sb.append("{"); sb.append("\"multi-line\": [\"line 1 \n \",\"line 2 \n \",\"line 3\"],"); diff --git a/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java b/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java index 5d8e7136fd5..0d995022c97 100644 --- a/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java +++ b/engine-tests/src/test/java/org/terasology/identity/CertificateTests.java @@ -1,27 +1,12 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ + public class CertificateTests { @Test diff --git a/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java b/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java index bbc8671a8f0..d4fd601162f 100644 --- a/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java +++ b/engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.junit.jupiter.api.Test; @@ -23,9 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - * - */ + public class MasterSecretGeneratorTests { @Test diff --git a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java index ab34a923227..da21dfb59b8 100644 --- a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.gson.JsonElement; diff --git a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java index 1694c867381..84a140fdfc5 100644 --- a/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java +++ b/engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java index 0d418a43f35..c7893ba56e2 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java index 3c32cd6c400..fcefb2a9d59 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.BeforeEach; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java index 85cd64ec505..95b90084780 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java b/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java index 7973f1c3d84..87466945464 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/Example.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.slf4j.Logger; @@ -55,10 +42,10 @@ public static void main(String[] args) { treeBuilder.registerDecorator("repeat", Repeat.class); actor = new Actor(null); actor.setDelta(0.1f); - node = treeBuilder.fromJson("{ sequence:[ " + - "{repeat :{ count:5, child:{print:{msg:x}}}}, success, { delay:{duration:1}}, { print:{msg:Hello} }, { delay:{duration:1}}, { print:{msg:World} } " - + - "] }"); + node = treeBuilder.fromJson( + "{ sequence:[ " + + "{repeat :{ count:5, child:{print:{msg:x}}}}, success, { delay:{duration:1}}, { print:{msg:Hello} }, { delay:{duration:1}}, { print:{msg:World} } " + + "] }"); tree = new DefaultBehaviorTreeRunner(node, actor); for (int i = 0; i < 100; i++) { tree.step(); diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java index 40c043b6fd2..bb77646fcb2 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Disabled; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java index d3c008233e4..0f3ffed011b 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java b/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java index 487bea39e20..c057593abdf 100644 --- a/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.logic.behavior; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java b/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java index 05c25700e26..c0819215043 100644 --- a/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java @@ -6,8 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertSame; -/** - */ public class KinematicCharacterMoverTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java b/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java index 8fe5d537868..53e9e4fc305 100644 --- a/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console; diff --git a/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java b/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java index 005a28b2003..617e9175977 100644 --- a/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java +++ b/engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java @@ -19,8 +19,6 @@ import static org.terasology.joml.test.VectorAssert.assertEquals; -/** - */ @Tag("TteTest") public class LocationComponentTest extends TerasologyTestingEnvironment { diff --git a/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java b/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java index 66e4066011e..ad8ac784da1 100644 --- a/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java +++ b/engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; @@ -29,20 +16,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ + public class Diamond3iIteratorTest { @Test public void testZeroDistanceIteration() { - Iterator iter = Diamond3iIterable.region(new org.joml.Vector3i(),0).build().iterator(); + Iterator iter = Diamond3iIterable.region(new org.joml.Vector3i(), 0).build().iterator(); assertEquals(Lists.newArrayList(new Vector3i()), Lists.newArrayList(iter)); } @Test public void testOneDistanceIteration() { - Iterator iter = Diamond3iIterable.region(new Vector3i(),1).build().iterator(); + Iterator iter = Diamond3iIterable.region(new Vector3i(), 1).build().iterator(); Set expected = Sets.newHashSet(new Vector3i(), new Vector3i(1, 0, 0), new Vector3i(-1, 0, 0), new Vector3i(0, 1, 0), new Vector3i(0, -1, 0), new Vector3i(0, 0, 1), new Vector3i(0, 0, -1)); while (iter.hasNext()) { @@ -55,7 +40,7 @@ public void testOneDistanceIteration() { @Test public void testTwoDistanceIteration() { int cc = 0; - for (Vector3ic next : Diamond3iIterable.region(new Vector3i(), 2).build()){ + for (Vector3ic next : Diamond3iIterable.region(new Vector3i(), 2).build()) { assertTrue(next.gridDistance(new Vector3i()) <= 2); cc++; } diff --git a/engine-tests/src/test/java/org/terasology/math/DirectionTests.java b/engine-tests/src/test/java/org/terasology/math/DirectionTests.java index 4994e34587b..eabc65338f8 100644 --- a/engine-tests/src/test/java/org/terasology/math/DirectionTests.java +++ b/engine-tests/src/test/java/org/terasology/math/DirectionTests.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.Nested; diff --git a/engine-tests/src/test/java/org/terasology/math/IntMathTest.java b/engine-tests/src/test/java/org/terasology/math/IntMathTest.java index 67afef7d768..cc768355c1c 100644 --- a/engine-tests/src/test/java/org/terasology/math/IntMathTest.java +++ b/engine-tests/src/test/java/org/terasology/math/IntMathTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.AfterAll; @@ -30,9 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - * - */ + public class IntMathTest { public IntMathTest() { } diff --git a/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java b/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java index e0358f1a436..3c6af73b4a9 100644 --- a/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java +++ b/engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/math/RotationTest.java b/engine-tests/src/test/java/org/terasology/math/RotationTest.java index e0bedcd5e3a..d9748738756 100644 --- a/engine-tests/src/test/java/org/terasology/math/RotationTest.java +++ b/engine-tests/src/test/java/org/terasology/math/RotationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import com.google.common.collect.Iterables; @@ -30,8 +17,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.terasology.joml.test.QuaternionAssert.assertEquals; -/** - */ public class RotationTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/math/SideTest.java b/engine-tests/src/test/java/org/terasology/math/SideTest.java index 37324c1e8dc..b719828d71f 100644 --- a/engine-tests/src/test/java/org/terasology/math/SideTest.java +++ b/engine-tests/src/test/java/org/terasology/math/SideTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.math; import org.junit.jupiter.api.Test; @@ -21,8 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class SideTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/network/TestNetwork.java b/engine-tests/src/test/java/org/terasology/network/TestNetwork.java index 6ca43d62f5a..50812892aaa 100644 --- a/engine-tests/src/test/java/org/terasology/network/TestNetwork.java +++ b/engine-tests/src/test/java/org/terasology/network/TestNetwork.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; @@ -37,8 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.mock; -/** - */ @Tag("TteTest") public class TestNetwork extends TerasologyTestingEnvironment { diff --git a/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java b/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java index f181cd30db3..1967364b245 100644 --- a/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java +++ b/engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java b/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java index 54a68dd261d..5a3aaeada73 100644 --- a/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java +++ b/engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.updating; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java b/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java index e18449ad4c2..1f7561f9693 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import com.google.common.collect.Lists; @@ -34,8 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class EntityDataJSONFormatTest { public static final String VALUE_NAME = "Name"; diff --git a/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java b/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java index e5fe5308d2b..34b6b4bb219 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/TemplateEngineTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; diff --git a/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java b/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java index d2ba7f3e3a0..fbc254d491a 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/WorldSerializerTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.junit.jupiter.api.Tag; diff --git a/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java b/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java index 7476908f917..dd1ce18fe9b 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/internal/GamePreviewImageProviderTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.codehaus.plexus.util.FileUtils; diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java index 3aa889d4b9f..a330084fc24 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerAdapterTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.Gson; @@ -66,7 +53,7 @@ public void testWrite() { assertEquals(OBJECT_JSON_ARRAY, serializedObject); } - private static class TestClass { + private static final class TestClass { private final Color color; private final int i; @@ -77,11 +64,15 @@ private TestClass(Color color, int i) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } TestClass testClass = (TestClass) o; - return i == testClass.i && - Objects.equals(color, testClass.color); + return i == testClass.i + && Objects.equals(color, testClass.color); } } } diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java index ae0e856873b..daca4ff7bd2 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/GsonTypeHandlerLibraryAdapterFactoryTest.java @@ -22,7 +22,7 @@ public class GsonTypeHandlerLibraryAdapterFactoryTest { private static final TestClass OBJECT = new TestClass( new Color(0xDEADBEEF), - ImmutableSet.of(new Vector4f(0,0,0,0), new Vector4f(1,1,1,1)), + ImmutableSet.of(new Vector4f(0, 0, 0, 0), new Vector4f(1, 1, 1, 1)), ImmutableMap.of( "someRect", new Rectanglei(-3, -3).setSize(10, 10) @@ -57,14 +57,11 @@ public void testDeserialize() { assertEquals(OBJECT, deserializedObject); } - private static class TestClass { + private static final class TestClass { private final Color color; private final Set vector4fs; private final Map rectangleiMap; - // Will not be serialized - private final Map intMap; - private final int i; private TestClass(Color color, Set vector4fs, Map rectangleiMap, @@ -72,19 +69,23 @@ private TestClass(Color color, Set vector4fs, Map this.color = color; this.vector4fs = vector4fs; this.rectangleiMap = rectangleiMap; - this.intMap = intMap; + // Will not be serialized this.i = i; } @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } TestClass testClass = (TestClass) o; - return i == testClass.i && - Objects.equals(color, testClass.color) && - Objects.equals(vector4fs, testClass.vector4fs) && - Objects.equals(rectangleiMap, testClass.rectangleiMap); + return i == testClass.i + && Objects.equals(color, testClass.color) + && Objects.equals(vector4fs, testClass.vector4fs) + && Objects.equals(rectangleiMap, testClass.rectangleiMap); } } } diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java index c3cba22dd32..e2675b4ff8b 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/gson/PolymorphicTypeAdapterFactoryTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.common.collect.Lists; @@ -41,9 +28,7 @@ public class PolymorphicTypeAdapterFactoryTest { @Test public void testInterfaceReference() { - Walker walker = CAT; - - String json = interfaceGson.toJson(walker); + String json = interfaceGson.toJson(CAT); Walker newAnimal = interfaceGson.fromJson(json, Walker.class); @@ -52,9 +37,7 @@ public void testInterfaceReference() { @Test public void testBaseClassReference() { - Animal animal = CHEETAH; - - String json = baseClassGson.toJson(animal); + String json = baseClassGson.toJson(CHEETAH); Animal newAnimal = baseClassGson.fromJson(json, Animal.class); @@ -98,7 +81,7 @@ public void testInterfaceList() { assertTrue(newWalkers.get(2) instanceof Cheetah); } - private static class Capsule { + private static final class Capsule { private final Animal animal; private Capsule(Animal animal) { @@ -118,14 +101,18 @@ private Animal(String name) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Animal animal = (Animal) o; return Objects.equals(name, animal.name); } } - private static class Dog extends Animal { + private static final class Dog extends Animal { private final float tailLength; private Dog(float tailLength) { @@ -135,9 +122,15 @@ private Dog(float tailLength) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } Dog dog = (Dog) o; return Float.compare(dog.tailLength, tailLength) == 0; } @@ -153,9 +146,15 @@ private Cheetah(int spotCount) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } Cheetah cheetah = (Cheetah) o; return spotCount == cheetah.spotCount; } diff --git a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java index 436365cdf1a..e37306f1741 100644 --- a/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java +++ b/engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/IntegerRangeHandlerTest.java @@ -1,18 +1,5 @@ -/* -# * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.mathTypes; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java b/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java index 6b23961c1a8..b84254bd515 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/TypeInfoTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java b/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java index dd9d79febdb..355dd159e05 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/copy/strategy/MapCopyStrategyTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection.copy.strategy; import com.google.common.collect.Maps; @@ -26,8 +13,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class MapCopyStrategyTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java b/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java index 124b28f7a54..3e15c3c527f 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/reflect/ByteCodeReflectFactoryTest.java @@ -15,8 +15,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ByteCodeReflectFactoryTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java b/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java index 6e794c9a7e8..2101a483395 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java +++ b/engine-tests/src/test/java/org/terasology/reflection/reflect/ConstructorLibraryTest.java @@ -14,7 +14,7 @@ public class ConstructorLibraryTest { @Test public void testArray() { - ObjectConstructor[]> constructor = library.get(new TypeInfo[]>() {}); + ObjectConstructor[]> constructor = library.get(new TypeInfo[]>() { }); List[] constructed = constructor.construct(); @@ -23,7 +23,7 @@ public void testArray() { @Test public void testMultidimensionalArray() { - ObjectConstructor constructor = library.get(new TypeInfo() {}); + ObjectConstructor constructor = library.get(new TypeInfo() { }); String[][] constructed = constructor.construct(); diff --git a/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java b/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java index 47ea202115c..e44c5439baa 100644 --- a/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java +++ b/engine-tests/src/test/java/org/terasology/reflection/reflect/PrivateComponent.java @@ -1,22 +1,7 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection.reflect; -/** - */ public final class PrivateComponent { private PrivateComponent() { diff --git a/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java b/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java index 25498314641..dad43023317 100644 --- a/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java +++ b/engine-tests/src/test/java/org/terasology/registry/CoreRegistryTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; diff --git a/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java b/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java index 2247bd70b70..efb4672d2ba 100644 --- a/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java +++ b/engine-tests/src/test/java/org/terasology/registry/InjectionHelperTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java b/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java index fc88ab7aef1..192ce6ee280 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/FontUnderlineTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering; diff --git a/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java b/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java index 3839cba880b..c6900b35547 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/animation/AnimationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.animation; diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java index 6466b0e9104..dba7a56ffd0 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/AWTTextureFormatTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.assets.texture; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java index 0ed59087e5b..df51dcffb59 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureAssetResolverTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.assets.texture; diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java index c9ae9faae1f..4e3917ceaaf 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureDataFactoryTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.assets.texture; import org.junit.jupiter.api.Test; @@ -27,8 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class TextureDataFactoryTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java index 70e4bc823f5..60c6e99a026 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/assets/texture/TextureUtilTest.java @@ -10,8 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class TextureUtilTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java b/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java index bf5ad44307d..a8fcd5beac9 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/dag/RenderTaskListGeneratorTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.dag; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java b/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java index f79f6bc06f4..22fe73a8cba 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java +++ b/engine-tests/src/test/java/org/terasology/rendering/dag/SetName.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.dag; import com.google.common.base.Objects; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java index c3c0302d58d..17ae1cd321a 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/CardLayoutTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; import org.joml.Vector2i; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java index 679b83a4909..995f83c0417 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ColumnLayoutTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; import org.joml.Vector2i; @@ -112,14 +99,16 @@ public void testThreeColumnsProportionallySized() throws Exception { // Gets one-fifth of entire area verify(canvas).drawWidget(itemAt2x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2, ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 2 / 10, 10)); // Gets three-tens of entire area - verify(canvas).drawWidget(itemAt3x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 3 / 10, 10)); + verify(canvas).drawWidget(itemAt3x1, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, + ((CANVAS_HEIGHT - 20) / 2), CANVAS_WIDTH * 3 / 10, 10)); // Gets half of entire area verify(canvas).drawWidget(itemAt1x2, RectUtility.createFromMinAndSize(0, ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH / 2, 10)); // Gets one-fifth of entire area verify(canvas).drawWidget(itemAt2x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2, ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH * 2 / 10, 10)); // Gets three-tens of entire area - verify(canvas).drawWidget(itemAt3x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH * 3 / 10, 10)); + verify(canvas).drawWidget(itemAt3x2, RectUtility.createFromMinAndSize(CANVAS_WIDTH / 2 + CANVAS_WIDTH * 2 / 10, + ((CANVAS_HEIGHT - 20) / 2) + 10, CANVAS_WIDTH * 3 / 10, 10)); } @Test diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java index 8171c07d831..67796f07ef6 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/RowLayoutTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; import org.joml.Vector2i; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java index 65ff5fba3ee..feb68928613 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/layouts/ZoomableLayoutTest.java @@ -1,25 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.layouts; -import org.terasology.joml.geom.Rectanglei; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.joml.Vector2f; import org.joml.Vector2i; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.terasology.joml.geom.Rectanglei; import org.terasology.nui.Canvas; import org.terasology.nui.layouts.ZoomableLayout; @@ -114,12 +101,19 @@ public void testScaling() throws Exception { //world size scaled to fit ratio of screen size - world size now 200 x 100 assertEquals(zoomableLayout.getWindowSize(), new Vector2f(WORLD_WIDTH * 2, WORLD_HEIGHT)); assertEquals(zoomableLayout.getScreenSize(), new Vector2i(CANVAS_WIDTH, CANVAS_HEIGHT)); - assertEquals(zoomableLayout.getPixelSize(), new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2), CANVAS_HEIGHT / WORLD_HEIGHT)); + assertEquals(zoomableLayout.getPixelSize(), + new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2), CANVAS_HEIGHT / WORLD_HEIGHT)); //coordinates on widgets scaled down by half - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x / 2), ceilToInt(pos1.y / 2)), new Vector2i(ceilToInt((pos1.x + size1.x) / 2), ceilToInt((pos1.y + size1.y) / 2)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(ceilToInt(pos2.x / 2), ceilToInt(pos2.y / 2)), new Vector2i(ceilToInt((pos2.x + size2.x) / 2), ceilToInt((pos2.y + size2.y) / 2)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x / 2), ceilToInt(pos3.y / 2)), new Vector2i(ceilToInt((pos3.x + size3.x) / 2), ceilToInt((pos3.y + size3.y) / 2)))); + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x / 2), ceilToInt(pos1.y / 2)), + new Vector2i(ceilToInt((pos1.x + size1.x) / 2), ceilToInt((pos1.y + size1.y) / 2)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(ceilToInt(pos2.x / 2), ceilToInt(pos2.y / 2)), + new Vector2i(ceilToInt((pos2.x + size2.x) / 2), ceilToInt((pos2.y + size2.y) / 2)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x / 2), ceilToInt(pos3.y / 2)), + new Vector2i(ceilToInt((pos3.x + size3.x) / 2), ceilToInt((pos3.y + size3.y) / 2)))); } @@ -135,11 +129,18 @@ public void testZoomOut() throws Exception { //world size doubled assertEquals(zoomableLayout.getWindowSize(), new Vector2f(WORLD_WIDTH * 2 * 2, WORLD_HEIGHT * 2)); assertEquals(zoomableLayout.getScreenSize(), new Vector2i(CANVAS_WIDTH, CANVAS_HEIGHT)); - assertEquals(zoomableLayout.getPixelSize(), new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2 * 2), CANVAS_HEIGHT / (WORLD_HEIGHT * 2))); - - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x / 4), ceilToInt(pos1.y / 4)), new Vector2i(ceilToInt((pos1.x + size1.x) / 4), ceilToInt((pos1.y + size1.y) / 4)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(ceilToInt(pos2.x / 4), ceilToInt(pos2.y / 4)), new Vector2i(ceilToInt((pos2.x + size2.x) / 4), ceilToInt((pos2.y + size2.y) / 4)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x / 4), ceilToInt(pos3.y / 4)), new Vector2i(ceilToInt((pos3.x + size3.x) / 4), ceilToInt((pos3.y + size3.y) / 4)))); + assertEquals(zoomableLayout.getPixelSize(), + new Vector2f(CANVAS_WIDTH / (WORLD_WIDTH * 2 * 2), CANVAS_HEIGHT / (WORLD_HEIGHT * 2))); + + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x / 4), ceilToInt(pos1.y / 4)), + new Vector2i(ceilToInt((pos1.x + size1.x) / 4), ceilToInt((pos1.y + size1.y) / 4)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(ceilToInt(pos2.x / 4), ceilToInt(pos2.y / 4)), + new Vector2i(ceilToInt((pos2.x + size2.x) / 4), ceilToInt((pos2.y + size2.y) / 4)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x / 4), ceilToInt(pos3.y / 4)), + new Vector2i(ceilToInt((pos3.x + size3.x) / 4), ceilToInt((pos3.y + size3.y) / 4)))); } @@ -155,20 +156,33 @@ public void testZoomInAndDrag() throws Exception { //world size halved assertEquals(zoomableLayout.getWindowSize(), new Vector2f(WORLD_WIDTH, WORLD_HEIGHT / 2)); assertEquals(zoomableLayout.getScreenSize(), new Vector2i(CANVAS_WIDTH, CANVAS_HEIGHT)); - assertEquals(zoomableLayout.getPixelSize(), new Vector2f(CANVAS_WIDTH / WORLD_WIDTH, CANVAS_HEIGHT / (WORLD_HEIGHT / 2))); - - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x), ceilToInt(pos1.y)), new Vector2i(ceilToInt(pos1.x + size1.x), ceilToInt(pos1.y + size1.y)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(ceilToInt(pos2.x), ceilToInt(pos2.y)), new Vector2i(ceilToInt(pos2.x + size2.x), ceilToInt(pos2.y + size2.y)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x), ceilToInt(pos3.y)), new Vector2i(ceilToInt(pos3.x + size3.x), ceilToInt(pos3.y + size3.y)))); + assertEquals(zoomableLayout.getPixelSize(), + new Vector2f(CANVAS_WIDTH / WORLD_WIDTH, CANVAS_HEIGHT / (WORLD_HEIGHT / 2))); + + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x), ceilToInt(pos1.y)), + new Vector2i(ceilToInt(pos1.x + size1.x), ceilToInt(pos1.y + size1.y)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(ceilToInt(pos2.x), ceilToInt(pos2.y)), + new Vector2i(ceilToInt(pos2.x + size2.x), ceilToInt(pos2.y + size2.y)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x), ceilToInt(pos3.y)), + new Vector2i(ceilToInt(pos3.x + size3.x), ceilToInt(pos3.y + size3.y)))); //simulate drag to item2 zoomableLayout.setWindowPosition(pos2); zoomableLayout.onDraw(canvas); //item1 out of canvas - verify(canvas).drawWidget(item1, new Rectanglei(new Vector2i(ceilToInt(pos1.x - pos2.x), ceilToInt(pos1.y - pos2.y)), new Vector2i(ceilToInt(pos1.x + size1.x - pos2.x), ceilToInt(pos1.y + size1.y - pos2.y)))); - verify(canvas).drawWidget(item2, new Rectanglei(new Vector2i(), new Vector2i(ceilToInt(size2.x), ceilToInt(size2.y)))); - verify(canvas).drawWidget(item3, new Rectanglei(new Vector2i(ceilToInt(pos3.x - pos2.x), ceilToInt(pos3.y - pos2.y)), new Vector2i(ceilToInt(pos3.x + size3.x - pos2.x), ceilToInt(pos3.y + size3.y - pos2.y)))); + verify(canvas).drawWidget(item1, new Rectanglei( + new Vector2i(ceilToInt(pos1.x - pos2.x), ceilToInt(pos1.y - pos2.y)), + new Vector2i(ceilToInt(pos1.x + size1.x - pos2.x), ceilToInt(pos1.y + size1.y - pos2.y)))); + verify(canvas).drawWidget(item2, new Rectanglei( + new Vector2i(), + new Vector2i(ceilToInt(size2.x), ceilToInt(size2.y)))); + verify(canvas).drawWidget(item3, new Rectanglei( + new Vector2i(ceilToInt(pos3.x - pos2.x), ceilToInt(pos3.y - pos2.y)), + new Vector2i(ceilToInt(pos3.x + size3.x - pos2.x), ceilToInt(pos3.y + size3.y - pos2.y)))); } } diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java index 1820b57d920..bbbfbb68576 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserParameterizedTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.browser.data.basic; import org.junit.jupiter.params.ParameterizedTest; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java index b32265f0b54..b1decf73e14 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/basic/HTMLLikeParserTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.browser.data.basic; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java index 6fa77567161..32152dab129 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/browser/data/html/HTMLParserTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.browser.data.html; import org.junit.jupiter.api.Assertions; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java index 0690afa5a87..48ceeb503b6 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/GenericTreeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.treeView; import com.google.common.collect.Lists; diff --git a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java index 78234142242..e35754f16de 100644 --- a/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java +++ b/engine-tests/src/test/java/org/terasology/rendering/nui/widgets/treeView/JsonTreeConverterTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.rendering.nui.widgets.treeView; import com.google.common.base.Charsets; diff --git a/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java b/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java index 0389fcc4bde..c86a297f352 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/CamelCaseMatcherTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; diff --git a/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java b/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java index eea530762d2..99df574255f 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/MersenneRandomTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java b/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java index 3223b01c0af..1e05991c693 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/NoiseTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; diff --git a/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java b/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java index 9b944383088..740d53c79cf 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/ReflectionUtilTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; import org.junit.jupiter.api.Test; @@ -30,15 +17,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ + public class ReflectionUtilTest { @Test public void testGetClassOfTypeWildcard() { - class C {} + class C { } - ParameterizedType cType = (ParameterizedType) new TypeInfo>() {}.getType(); + ParameterizedType cType = (ParameterizedType) new TypeInfo>() { }.getType(); Type wildcardType = cType.getActualTypeArguments()[0]; assertEquals(Object.class, ReflectionUtil.getRawType(wildcardType)); @@ -56,8 +41,8 @@ public void testGetParameterForGenericInterface() { @Test public void testGetParameterForBuriedGenericInterface() { - class Base {} - class Sub extends Base implements MarkerA {} + class Base { } + class Sub extends Base implements MarkerA { } Type parameter = ReflectionUtil.getTypeParameterForSuper(Sub.class, MarkerA.class, 0); @@ -66,7 +51,7 @@ class Sub extends Base implements MarkerA {} @Test public void testGetParameterForUnboundGenericInterface() { - Type parameter = ReflectionUtil.getTypeParameterForSuper(new TypeInfo>() {}.getType(), CopyStrategy.class, 0); + Type parameter = ReflectionUtil.getTypeParameterForSuper(new TypeInfo>() { }.getType(), CopyStrategy.class, 0); assertTrue(parameter instanceof WildcardType); } @@ -80,13 +65,13 @@ public T copy(T value) { } } - class SubClass extends SubInterface {} + class SubClass extends SubInterface { } - Type subInterfaceType = new TypeInfo>() {}.getType(); + Type subInterfaceType = new TypeInfo>() { }.getType(); assertEquals(Integer.class, ReflectionUtil.getTypeParameterForSuper(subInterfaceType, CopyStrategy.class, 0)); - Type subClassType = new TypeInfo() {}.getType(); + Type subClassType = new TypeInfo() { }.getType(); assertEquals(String.class, ReflectionUtil.getTypeParameterForSuper(subClassType, CopyStrategy.class, 0)); } @@ -122,7 +107,7 @@ class SomeClass { typeInfo.getRawType().getDeclaredFields()[0].getGenericType() ); - assertEquals(new TypeInfo>() {}.getType(), resolvedFieldType); + assertEquals(new TypeInfo>() { }.getType(), resolvedFieldType); } @Test @@ -140,7 +125,7 @@ class SomeClass { typeInfo.getRawType().getDeclaredFields()[0].getGenericType() ); - assertEquals(new TypeInfo>() {}.getType(), resolvedFieldType); + assertEquals(new TypeInfo>() { }.getType(), resolvedFieldType); resolvedFieldType = ReflectionUtil.resolveType( typeInfo.getType(), @@ -165,7 +150,7 @@ class SomeClass { typeInfo.getRawType().getDeclaredFields()[0].getGenericType() ); - assertEquals(new TypeInfo>() {}.getType(), resolvedFieldType); + assertEquals(new TypeInfo>() { }.getType(), resolvedFieldType); resolvedFieldType = ReflectionUtil.resolveType( typeInfo.getType(), @@ -223,10 +208,10 @@ class SomeClass { @Test public void testResolveThroughGenericSupertypes() { - class B implements MarkerB, MarkerA {} + class B implements MarkerB, MarkerA { } ParameterizedType resolvedTypeForB = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), ReflectionUtil.parameterizeRawType(B.class) ); @@ -238,21 +223,21 @@ class B implements MarkerB, MarkerA {} @Test public void testResolveThroughInheritanceTree() { - class A implements MarkerA, MarkerC {} - class B extends A implements MarkerB, MarkerC {} - class C extends B {} + class A implements MarkerA, MarkerC { } + class B extends A implements MarkerB, MarkerC { } + class C extends B { } final Type typeToResolve = ReflectionUtil.parameterizeRawType(C.class); ParameterizedType resolvedThroughMarkerA = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), typeToResolve ); assertEquals(String.class, resolvedThroughMarkerA.getActualTypeArguments()[0]); ParameterizedType resolvedThroughMarkerB = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), typeToResolve ); @@ -261,20 +246,20 @@ class C extends B {} ParameterizedType resolvedThroughAWithIncorrectFirstType = (ParameterizedType) ReflectionUtil.resolveType( - new TypeInfo>() {}.getType(), + new TypeInfo>() { }.getType(), typeToResolve ); assertEquals(String.class, resolvedThroughAWithIncorrectFirstType.getActualTypeArguments()[0]); } - interface MarkerA {} + interface MarkerA { } - interface MarkerB {} + interface MarkerB { } - interface MarkerC {} + interface MarkerC { } - interface GenericInterfaceSubInterface extends CopyStrategy {} + interface GenericInterfaceSubInterface extends CopyStrategy { } public static class UnboundInterfaceImplementor implements CopyStrategy { diff --git a/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java b/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java index 7ca1f932a20..d3dd1d3504b 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities; diff --git a/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java b/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java index c0bd77eb84a..7fb41dd9a00 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/collection/CircularBufferTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities.collection; import com.google.common.collect.ImmutableList; @@ -27,8 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class CircularBufferTest { @Test diff --git a/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java b/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java index 0e2fe0ecbc0..76f2bd9c2c7 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/time/DateTimeHelperTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities.time; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java b/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java index f25bd40cc8b..17cbb5afb5c 100644 --- a/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java +++ b/engine-tests/src/test/java/org/terasology/utilities/tree/SpaceTreeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.utilities.tree; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/world/ChunkTest.java b/engine-tests/src/test/java/org/terasology/world/ChunkTest.java index a665fd6f921..ad2b8cb0b58 100644 --- a/engine-tests/src/test/java/org/terasology/world/ChunkTest.java +++ b/engine-tests/src/test/java/org/terasology/world/ChunkTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world; import org.joml.Vector3f; diff --git a/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java b/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java index 37f66af09db..5fbd610aec7 100644 --- a/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java +++ b/engine-tests/src/test/java/org/terasology/world/Zones/LayeredZoneRegionFunctionTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.Zones; import com.google.common.collect.ArrayListMultimap; diff --git a/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java b/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java index 906513589fc..0d33437778b 100644 --- a/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java +++ b/engine-tests/src/test/java/org/terasology/world/Zones/ZoneTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.Zones; import org.junit.jupiter.api.BeforeEach; @@ -44,7 +31,7 @@ public void testGetChildZones() { try { zone.getChildZone("Invalid name"); fail(); - } catch (Exception e) {} + } catch (Exception e) { } assertEquals(child, zone.getChildZone("Child")); } diff --git a/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java b/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java index f507fd7cb85..a4106d48e02 100644 --- a/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java +++ b/engine-tests/src/test/java/org/terasology/world/block/BlockRegionTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.world.block; diff --git a/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java b/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java index 136408f9607..c5f59592350 100644 --- a/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java +++ b/engine-tests/src/test/java/org/terasology/world/block/shape/BlockShapeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.block.shape; import com.badlogic.gdx.physics.bullet.collision.btConvexHullShape; diff --git a/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java b/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java index 6b02bda3fea..4db81bbb9cf 100644 --- a/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java +++ b/engine-tests/src/test/java/org/terasology/world/chunks/pipeline/ChunkProcessingPipelineTest.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.chunks.pipeline; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java b/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java index 40c015d41f3..5366a803233 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/WorldBuilderTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation; import org.junit.jupiter.api.Test; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java index b48bde665c2..65043211c3d 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseBooleanFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java index 568d8de07f2..0cf73d30465 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseFieldFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java index 5878492eb5c..4cba72a959a 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BaseObjectFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java index 93be03452db..4299f295dd7 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/BooleanFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java index fddb5914ef6..c59378a2c6c 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/FieldFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java index d68a9fa6e0d..ec6d64c7793 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/ObjectFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java index 6929fb6745d..c24b4419ee1 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseBooleanFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java index 042d69e0e87..84807b7f59f 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseFieldFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java index 37f27d0841f..b30eeeb8b4c 100644 --- a/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java +++ b/engine-tests/src/test/java/org/terasology/world/generation/facets/SparseObjectFacetTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.generation.facets; diff --git a/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java b/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java index 40275f82d54..ba1dd15345b 100644 --- a/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java +++ b/engine-tests/src/test/java/org/terasology/world/propagation/BetweenChunkPropagationTest.java @@ -171,7 +171,7 @@ public void testPropagateSunlightAppearingMidChunk() { topChunk.setSunlight(pos, (byte) 0); topChunk.setSunlightRegen(pos, (byte) 0); } - for (Vector3ic pos : new BlockRegion(8, 0, 8).setSize(Chunks.SIZE_X- 16, 1, Chunks.SIZE_Z- 16)) { + for (Vector3ic pos : new BlockRegion(8, 0, 8).setSize(Chunks.SIZE_X - 16, 1, Chunks.SIZE_Z - 16)) { topChunk.setSunlight(pos, (byte) 0); topChunk.setSunlightRegen(pos, (byte) 32); } diff --git a/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java b/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java index 5156843e31f..26f27a47e5a 100644 --- a/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java +++ b/engine-tests/src/test/java/org/terasology/world/propagation/BulkLightPropagationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.propagation; import org.joml.Vector3i; diff --git a/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java b/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java index 2673dec6e6b..64181947292 100644 --- a/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java +++ b/engine-tests/src/test/java/org/terasology/world/propagation/BulkSunlightPropagationTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.propagation; import com.google.common.collect.Maps; @@ -36,10 +23,6 @@ import org.terasology.engine.world.block.shapes.BlockShape; import org.terasology.engine.world.block.tiles.NullWorldAtlas; import org.terasology.engine.world.chunks.Chunks; -import org.terasology.engine.world.propagation.BatchPropagator; -import org.terasology.engine.world.propagation.BlockChange; -import org.terasology.engine.world.propagation.StandardBatchPropagator; -import org.terasology.engine.world.propagation.SunlightRegenBatchPropagator; import org.terasology.engine.world.propagation.light.SunlightPropagationRules; import org.terasology.engine.world.propagation.light.SunlightRegenPropagationRules; diff --git a/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java b/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java index 8d130ea6fd5..a021880ec52 100644 --- a/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java +++ b/engine-tests/src/test/java/org/terasology/world/time/WorldTimeTest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.world.time; diff --git a/engine-tests/src/test/resources/logback.xml b/engine-tests/src/test/resources/logback.xml index bea53b30b7a..9966e57db4d 100644 --- a/engine-tests/src/test/resources/logback.xml +++ b/engine-tests/src/test/resources/logback.xml @@ -1,3 +1,6 @@ + + + diff --git a/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java b/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java index 8d46fd358b0..c5dae8d4e9c 100644 --- a/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java +++ b/engine/src/jmh/java/org/terasology/benchmark/reflectFactory/GetterSetterComponent.java @@ -17,8 +17,6 @@ import org.terasology.engine.entitySystem.Component; -/** - */ public class GetterSetterComponent implements Component { private int value; diff --git a/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java b/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java index 333cb30a22c..ebd6917bee4 100644 --- a/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java +++ b/engine/src/main/java/org/terasology/engine/audio/AudioEndListener.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; /** diff --git a/engine/src/main/java/org/terasology/engine/audio/AudioManager.java b/engine/src/main/java/org/terasology/engine/audio/AudioManager.java index ac9e70d9b7d..efff39e71a6 100644 --- a/engine/src/main/java/org/terasology/engine/audio/AudioManager.java +++ b/engine/src/main/java/org/terasology/engine/audio/AudioManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; import org.joml.Quaternionfc; diff --git a/engine/src/main/java/org/terasology/engine/audio/Sound.java b/engine/src/main/java/org/terasology/engine/audio/Sound.java index 4becf5526ae..f0ce4edf466 100644 --- a/engine/src/main/java/org/terasology/engine/audio/Sound.java +++ b/engine/src/main/java/org/terasology/engine/audio/Sound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; import org.terasology.gestalt.assets.Asset; diff --git a/engine/src/main/java/org/terasology/engine/audio/StaticSound.java b/engine/src/main/java/org/terasology/engine/audio/StaticSound.java index 5d0eb4ef7e2..a6a8016e63e 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StaticSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/StaticSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java b/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java index f410f7193a1..18b5547f3e3 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java +++ b/engine/src/main/java/org/terasology/engine/audio/StaticSoundData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java b/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java index f51ca0463d9..2f4c6ef6285 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/StreamingSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java b/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java index 6245993ff4a..b8ad39d29c6 100644 --- a/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java +++ b/engine/src/main/java/org/terasology/engine/audio/StreamingSoundData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java b/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java index 347220ba54f..351bc3415f7 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/AbstractPlaySoundEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.events; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java index e194b0d3893..7516cc2e8cf 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.events; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java index 8ccab2940e1..284e3c18d9b 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/PlaySoundForOwnerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.events; diff --git a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java index bccae5c27e7..1cac9a3f336 100644 --- a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java +++ b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 /** * This package provides a low-level system for describing classes and fields, with support for construction and field access. Essentially it is a simplified reflection diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java index 8d40ff2bf87..a21196acb70 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggReader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; import com.jcraft.jogg.Packet; diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java index 98f3e9eaeb1..351654e61e2 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggSoundFormat.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; @@ -29,8 +16,6 @@ import java.nio.ByteBuffer; import java.util.List; -/** - */ @RegisterAssetFileFormat public class OggSoundFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java index 8ac3a85602b..25016ad5e83 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; @@ -27,9 +14,7 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -/** - * - */ + public class OggStreamingSoundData implements StreamingSoundData { private static final Logger logger = LoggerFactory.getLogger(OggStreamingSoundData.class); diff --git a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java index b735d8634aa..c62be8bf6b1 100644 --- a/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java +++ b/engine/src/main/java/org/terasology/engine/audio/formats/OggStreamingSoundFormat.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.formats; @@ -25,8 +12,6 @@ import java.io.IOException; import java.util.List; -/** - */ @RegisterAssetFileFormat public class OggStreamingSoundFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java index 6c0c1b52467..1aee89c2cdb 100644 --- a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java +++ b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullAudioManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.nullAudio; diff --git a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java index 895d5987f0e..6f35ed6659f 100644 --- a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.nullAudio; import org.terasology.engine.audio.StaticSound; diff --git a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java index 60539317a8c..b7d84a58009 100644 --- a/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/nullAudio/NullStreamingSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.nullAudio; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java index 29ff70a1ca6..184786930d1 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java index f8dc0c1decb..268adbebe93 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/BaseSoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java index 7a701192b38..8b1f83aadd4 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.lwjgl.openal.AL10; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java index 62db963a4ec..b9081a7592d 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/OpenALManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java index cdcaaced1a6..e0fc9d0e671 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.terasology.engine.audio.Sound; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java index 464589b9c70..ced598f1196 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/SoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL; import org.joml.Vector3fc; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java index 71ab5321d55..e0541c1184c 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSound.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.staticSound; import org.lwjgl.openal.AL10; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java index f4785941366..24e09640d4a 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.staticSound; import org.terasology.engine.audio.openAL.BaseSoundPool; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java index 1ad95682d67..69997162950 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/staticSound/OpenALSoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.staticSound; @@ -28,9 +15,7 @@ import static org.lwjgl.openal.AL10.alGetSourcei; import static org.lwjgl.openal.AL10.alSourcei; -/** - * - */ + public class OpenALSoundSource extends BaseSoundSource { private OpenALSound audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java index e12b75dbe95..ecb91fe6a12 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSound.java @@ -35,7 +35,8 @@ public final class OpenALStreamingSound extends StreamingSound { private OpenALStreamingSound.DisposalAction internalResources; private int lastUpdatedBuffer; - public OpenALStreamingSound(ResourceUrn urn, AssetType assetType, StreamingSoundData data, OpenALManager audioManager, OpenALStreamingSound.DisposalAction disposableAction) { + public OpenALStreamingSound(ResourceUrn urn, AssetType assetType, StreamingSoundData data, + OpenALManager audioManager, OpenALStreamingSound.DisposalAction disposableAction) { super(urn, assetType, disposableAction); this.internalResources = disposableAction; this.internalResources.setAsset(this); diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java index 9e02661d8a0..e7be718bf08 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.streamingSound; import org.terasology.engine.audio.openAL.BaseSoundPool; diff --git a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java index dbee6306a3b..404668ba06d 100644 --- a/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java +++ b/engine/src/main/java/org/terasology/engine/audio/openAL/streamingSound/OpenALStreamingSoundSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.openAL.streamingSound; import org.lwjgl.BufferUtils; diff --git a/engine/src/main/java/org/terasology/engine/audio/package-info.java b/engine/src/main/java/org/terasology/engine/audio/package-info.java index 63b3ef3f995..72dd39cde59 100644 --- a/engine/src/main/java/org/terasology/engine/audio/package-info.java +++ b/engine/src/main/java/org/terasology/engine/audio/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.audio; diff --git a/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java b/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java index 7e7a851d1d9..df61c9f1bba 100644 --- a/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java +++ b/engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.audio.system; @@ -36,7 +23,6 @@ import org.terasology.engine.logic.players.LocalPlayer; import org.terasology.engine.network.ClientComponent; import org.terasology.engine.network.NetworkSystem; -import org.terasology.engine.physics.bullet.BulletPhysics; import org.terasology.engine.registry.In; import org.terasology.engine.utilities.Assets; diff --git a/engine/src/main/java/org/terasology/engine/config/AudioConfig.java b/engine/src/main/java/org/terasology/engine/config/AudioConfig.java index 6ca99ee183d..3116b1ebe5f 100644 --- a/engine/src/main/java/org/terasology/engine/config/AudioConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/AudioConfig.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/BindsConfig.java b/engine/src/main/java/org/terasology/engine/config/BindsConfig.java index 08de3103e94..2f1a3ecc5fd 100644 --- a/engine/src/main/java/org/terasology/engine/config/BindsConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/BindsConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java b/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java index d4ab9bc3bbd..37f111c199d 100644 --- a/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/ControllerConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java b/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java index 87f4f7b1c1d..018db515530 100644 --- a/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/IdentityStorageServiceConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.net.URL; diff --git a/engine/src/main/java/org/terasology/engine/config/InputConfig.java b/engine/src/main/java/org/terasology/engine/config/InputConfig.java index b74171cad30..890160ade47 100644 --- a/engine/src/main/java/org/terasology/engine/config/InputConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/InputConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import org.terasology.engine.context.internal.MockContext; diff --git a/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java b/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java index 5e1690d3f82..989cead2b1a 100644 --- a/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/MetricsUserPermissionConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.util.HashMap; diff --git a/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java b/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java index e328665be68..e64c6d800d3 100644 --- a/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/ModuleConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; @@ -21,8 +8,6 @@ import java.util.List; -/** - */ public class ModuleConfig { private List modules = Lists.newArrayList(); private String defaultGameplayModuleName = ""; diff --git a/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java b/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java index 4f0871ef8fb..7a4957d3a64 100644 --- a/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/NUIEditorConfig.java @@ -1,25 +1,10 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.util.Locale; -/** - * - */ + public class NUIEditorConfig { private boolean disableIcons; private boolean disableAutosave; diff --git a/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java b/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java index 366b535349c..33043178160 100644 --- a/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/NetworkConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; @@ -23,8 +10,6 @@ import java.util.Collections; import java.util.List; -/** - */ public class NetworkConfig { private List servers = Lists.newArrayList(new ServerInfo("localhost", "localhost", TerasologyConstants.DEFAULT_PORT)); diff --git a/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java b/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java index 4806c87fc3c..15ffe5d35ad 100644 --- a/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/PermissionConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.security.SecureRandom; diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java index caa5daab62c..31df80689dc 100644 --- a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java index a740008ec88..1470e039c27 100644 --- a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.beans.PropertyChangeEvent; @@ -23,8 +10,6 @@ import org.terasology.engine.rendering.world.WorldRendererImpl; import org.terasology.engine.utilities.subscribables.AbstractSubscribable; -/** - */ @API public class RenderingDebugConfig extends AbstractSubscribable implements PropertyChangeListener { public static final String WIREFRAME = "wireframe"; diff --git a/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java b/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java index 4b4a702b549..2aa05ab6010 100644 --- a/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/SecurityConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.collect.Maps; @@ -34,9 +21,7 @@ import java.util.Collections; import java.util.Map; -/** - * - */ + public class SecurityConfig { public static final SecurityPermission PRIVATE_CERTIFICATE_ACCESS_PERMISSION = new SecurityPermission("PRIVATE_CERTIFICATE_ACCESS_PERMISSION"); public static final SecurityPermission CERTIFICATE_WRITE_PERMISSION = new SecurityPermission("CERTIFICATE_WRITE_PERMISSION"); diff --git a/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java b/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java index 5a570382c13..06f9e7d7d8f 100644 --- a/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/SelectModulesConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import java.util.Collection; diff --git a/engine/src/main/java/org/terasology/engine/config/ServerInfo.java b/engine/src/main/java/org/terasology/engine/config/ServerInfo.java index e593443d462..e52930415ff 100644 --- a/engine/src/main/java/org/terasology/engine/config/ServerInfo.java +++ b/engine/src/main/java/org/terasology/engine/config/ServerInfo.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java b/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java index 808620fe67a..0382e1e811a 100644 --- a/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/TelemetryConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import org.terasology.engine.telemetry.TelemetryEmitter; diff --git a/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java b/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java index a875a6b6aa0..9d08f2bfdcb 100644 --- a/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/UniverseConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java b/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java index e87d34e2b61..0ef7c4b3850 100644 --- a/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/WebBrowserConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java b/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java index 867cf47a253..c32bba13e89 100644 --- a/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/WorldGenerationConfig.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config; import org.terasology.engine.core.SimpleUri; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java index 8919763ba65..6ab3355f38a 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfiguration.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.BindsConfig; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java index 90acaaf98b4..baff6e793c3 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/BindsConfigurationImpl.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.BindsConfig; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java index bec2652743d..a72290d128b 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfiguration.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.Config; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java index 5617aad9b2d..4dcd2b58f0a 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/InputDeviceConfigurationImpl.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.config.facade; import org.terasology.engine.config.Config; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java index ca3bd1ae44a..9ef110e428b 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.facade; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java index 42061dcf173..9d67fa1b17f 100644 --- a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java +++ b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfigurationImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.facade; import org.terasology.engine.config.TelemetryConfig; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java index e3b3b19d86b..0e5453bbddc 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java index 570d93b6ea8..55ce4dee4d3 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java index 4a6b075e5b8..0c7d2f10f4b 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfigTypeHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java index 4e1e7258ac1..1eab7b49f76 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; import org.terasology.engine.config.flexible.constraints.SettingConstraint; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java b/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java index dfdf28ee9e5..02316f06022 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/SettingChangeListener.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible; /** diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java index 2fa984c78ac..22f4d83830a 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/NumberRangeConstraint.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible.constraints; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java index 534ccf34f94..87bab16101a 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/SettingConstraint.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.config.flexible.constraints; import org.terasology.engine.config.flexible.Setting; diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java index 2462ccdd1ec..c35bffb928c 100644 --- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java +++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.config.flexible.constraints; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/context/Context.java b/engine/src/main/java/org/terasology/engine/context/Context.java index 390c7f9baa7..2384ebd6c9c 100644 --- a/engine/src/main/java/org/terasology/engine/context/Context.java +++ b/engine/src/main/java/org/terasology/engine/context/Context.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.context; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java b/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java index 419e45b7eda..28e94772338 100644 --- a/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java +++ b/engine/src/main/java/org/terasology/engine/context/internal/ContextImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.context.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java b/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java index dbf2e30acf8..f5b5c7ed614 100644 --- a/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java +++ b/engine/src/main/java/org/terasology/engine/context/internal/MockContext.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.context.internal; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/EngineTime.java b/engine/src/main/java/org/terasology/engine/core/EngineTime.java index a70894bcf2b..6314b6dcdc4 100644 --- a/engine/src/main/java/org/terasology/engine/core/EngineTime.java +++ b/engine/src/main/java/org/terasology/engine/core/EngineTime.java @@ -4,8 +4,6 @@ import java.util.Iterator; -/** - */ public interface EngineTime extends Time { /** diff --git a/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java b/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java index 286bcb59767..a30a3baad6f 100644 --- a/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java +++ b/engine/src/main/java/org/terasology/engine/core/StandardGameStatus.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core; -/** - */ public enum StandardGameStatus implements EngineStatus { UNSTARTED("Unstarted"), LOADING("Loading"), diff --git a/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java b/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java index da546b39b65..3ae42677d97 100644 --- a/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java +++ b/engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java @@ -84,24 +84,21 @@ * This GameEngine implementation is the heart of Terasology. *

*

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

*

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

*

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

*/ public class TerasologyEngine implements GameEngine { @@ -133,9 +130,8 @@ public class TerasologyEngine implements GameEngine { private Context rootContext; /** - * This constructor initializes the engine by initializing its systems, - * subsystems and managers. It also verifies that some required systems - * are up and running after they have been initialized. + * This constructor initializes the engine by initializing its systems, subsystems and managers. It also verifies + * that some required systems are up and running after they have been initialized. * * @param timeSubsystem the timer subsystem * @param subsystems other typical subsystems, e.g., graphics, audio and input subsystems. @@ -195,7 +191,9 @@ public TerasologyEngine(TimeSubsystem timeSubsystem, Collection } /** - * Provide ability to set additional engine classpath locations. This must be called before initialize() or run(). + * Provide ability to set additional engine classpath locations. This must be called before initialize() or + * run(). + * * @param clazz any class that appears in the resource location to treat as an engine classpath. */ protected void addToClassesOnClasspathsToAddToEngine(Class clazz) { @@ -210,7 +208,8 @@ public void initialize() { logger.info("Initializing Terasology..."); logEnvironmentInfo(); - // TODO: Need to get everything thread safe and get rid of the concept of "GameThread" as much as possible. + // TODO: Need to get everything thread safe and get rid of the concept of "GameThread" as much as + // possible. GameThread.setToCurrentThread(); preInitSubsystems(); @@ -263,8 +262,10 @@ private void logEnvironmentInfo() { logger.info("Home path: {}", PathManager.getInstance().getHomePath()); logger.info("Install path: {}", PathManager.getInstance().getInstallPath()); logger.info("Java: {} in {}", System.getProperty("java.version"), System.getProperty("java.home")); - logger.info("Java VM: {}, version: {}", System.getProperty("java.vm.name"), System.getProperty("java.vm.version")); - logger.info("OS: {}, arch: {}, version: {}", System.getProperty("os.name"), System.getProperty("os.arch"), System.getProperty("os.version")); + logger.info("Java VM: {}, version: {}", System.getProperty("java.vm.name"), System.getProperty("java.vm" + + ".version")); + logger.info("OS: {}, arch: {}, version: {}", System.getProperty("os.name"), System.getProperty("os.arch"), + System.getProperty("os.version")); logger.info("Max. Memory: {} MiB", Runtime.getRuntime().maxMemory() / ONE_MEBIBYTE); logger.info("Processors: {}", Runtime.getRuntime().availableProcessors()); if (NonNativeJVMDetector.JVM_ARCH_IS_NONNATIVE) { @@ -316,10 +317,12 @@ private void verifyRequiredSystemIsRegistered(Class clazz) { private void initManagers() { changeStatus(TerasologyEngineStatus.INITIALIZING_MODULE_MANAGER); - TypeRegistry.WHITELISTED_CLASSES = ExternalApiWhitelist.CLASSES.stream().map(Class::getName).collect(Collectors.toSet()); + TypeRegistry.WHITELISTED_CLASSES = + ExternalApiWhitelist.CLASSES.stream().map(Class::getName).collect(Collectors.toSet()); TypeRegistry.WHITELISTED_PACKAGES = ExternalApiWhitelist.PACKAGES; - ModuleManager moduleManager = new ModuleManager(rootContext.get(Config.class), classesOnClasspathsToAddToEngine); + ModuleManager moduleManager = new ModuleManager(rootContext.get(Config.class), + classesOnClasspathsToAddToEngine); ModuleTypeRegistry typeRegistry = new ModuleTypeRegistry(moduleManager.getEnvironment()); rootContext.put(ModuleTypeRegistry.class, typeRegistry); @@ -333,7 +336,8 @@ private void initManagers() { CopyStrategyLibrary copyStrategyLibrary = new CopyStrategyLibrary(reflectFactory); rootContext.put(CopyStrategyLibrary.class, copyStrategyLibrary); - rootContext.put(TypeHandlerLibrary.class, TypeHandlerLibraryImpl.forModuleEnvironment(moduleManager, typeRegistry)); + rootContext.put(TypeHandlerLibrary.class, TypeHandlerLibraryImpl.forModuleEnvironment(moduleManager, + typeRegistry)); changeStatus(TerasologyEngineStatus.INITIALIZING_ASSET_TYPES); assetTypeManager = new AutoReloadAssetTypeManager(); @@ -351,7 +355,8 @@ private void initAssets() { assetTypeManager.createAssetType(BlockSounds.class, BlockSounds::new, "blockSounds"); assetTypeManager.createAssetType(BlockTile.class, BlockTile::new, "blockTiles"); - AssetType blockFamilyDefinitionAssetType = assetTypeManager.createAssetType(BlockFamilyDefinition.class, BlockFamilyDefinition::new, "blocks"); + AssetType blockFamilyDefinitionAssetType = + assetTypeManager.createAssetType(BlockFamilyDefinition.class, BlockFamilyDefinition::new, "blocks"); assetTypeManager.getAssetFileDataProducer(blockFamilyDefinitionAssetType).addAssetFormat( new BlockFamilyDefinitionFormat(assetTypeManager.getAssetManager())); @@ -389,13 +394,11 @@ private void changeStatus(EngineStatus newStatus) { } /** - * Runs the engine, including its main loop. This method is called only once per - * application startup, which is the reason the GameState provided is the -initial- - * state rather than a generic game state. + * Runs the engine, including its main loop. This method is called only once per application startup, which is the + * reason the GameState provided is the -initial- state rather than a generic game state. * - * @param initialState In at least one context (the PC facade) the GameState - * implementation provided as input may vary, depending if - * the application has or hasn't been started headless. + * @param initialState In at least one context (the PC facade) the GameState implementation provided as + * input may vary, depending if the application has or hasn't been started headless. */ @Override public synchronized void run(GameState initialState) { @@ -451,9 +454,8 @@ public synchronized void runMain() { } /** - * The main loop runs until the EngineState is set back to INITIALIZED by shutdown() - * or until the OS requests the application's window to be closed. Engine cleanup - * and disposal occur afterwards. + * The main loop runs until the EngineState is set back to INITIALIZED by shutdown() or until the OS requests the + * application's window to be closed. Engine cleanup and disposal occur afterwards. */ private void mainLoop() { PerformanceMonitor.startActivity("Other"); @@ -466,6 +468,7 @@ private void mainLoop() { /** * Runs a single "tick" of the engine + * * @return true if the loop requesting a tick should continue running */ public boolean tick() { @@ -547,8 +550,8 @@ public void cleanup() { } /** - * Causes the main loop to stop at the end of the current frame, cleanly ending - * the current GameState, all running task threads and disposing subsystems. + * Causes the main loop to stop at the end of the current frame, cleanly ending the current GameState, all running + * task threads and disposing subsystems. */ @Override public void shutdown() { @@ -556,12 +559,11 @@ public void shutdown() { } /** - * Changes the game state, i.e. to switch from the MainMenu to Ingame via Loading screen - * (each is a GameState). The change can be immediate, if there is no current game - * state set, or scheduled, when a current state exists and the new state is stored as - * pending. That been said, scheduled changes occurs in the main loop through the call - * processStateChanges(). As such, from a user perspective in normal circumstances, - * scheduled changes are likely to be perceived as immediate. + * Changes the game state, i.e. to switch from the MainMenu to Ingame via Loading screen (each is a GameState). The + * change can be immediate, if there is no current game state set, or scheduled, when a current state exists and the + * new state is stored as pending. That been said, scheduled changes occurs in the main loop through the call + * processStateChanges(). As such, from a user perspective in normal circumstances, scheduled changes are likely to + * be perceived as immediate. */ @Override public void changeState(GameState newState) { @@ -626,10 +628,10 @@ public Context createChildContext() { } /** - * Allows it to obtain objects directly from the context of the game engine. It exists only for situations in - * which no child context exists yet. If there is a child context then it automatically contains the objects of - * the engine context. Thus normal code should just work with the (child) context that is available to it - * instead of using this method. + * Allows it to obtain objects directly from the context of the game engine. It exists only for situations in which + * no child context exists yet. If there is a child context then it automatically contains the objects of the engine + * context. Thus normal code should just work with the (child) context that is available to it instead of using this + * method. * * @return a object directly from the context of the game engine */ diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java index fb4e6e81a70..8d8a904c6f2 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.bootstrap; diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java index fec9684c468..a0a3e00da2b 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibraryImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.bootstrap; diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java index 8fb7592fd5b..84b688f87b3 100644 --- a/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java +++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java @@ -58,7 +58,6 @@ */ public final class EntitySystemSetupUtil { - private EntitySystemSetupUtil() { // static utility class, no instance needed } @@ -129,7 +128,9 @@ public static void addEntityManagementRelatedClasses(Context context) { CharacterStateEventPositionMap characterStateEventPositionMap = context.get(CharacterStateEventPositionMap.class); DirectionAndOriginPosRecorderList directionAndOriginPosRecorderList = context.get(DirectionAndOriginPosRecorderList.class); RecordedEventStore recordedEventStore = new RecordedEventStore(); - RecordAndReplaySerializer recordAndReplaySerializer = new RecordAndReplaySerializer(entityManager, recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); + RecordAndReplaySerializer recordAndReplaySerializer = + new RecordAndReplaySerializer(entityManager, recordedEventStore, recordAndReplayUtils, characterStateEventPositionMap, + directionAndOriginPosRecorderList, moduleManager, context.get(TypeRegistry.class)); context.put(RecordAndReplaySerializer.class, recordAndReplaySerializer); diff --git a/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java b/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java index d00ed55d4c0..a4fa989b089 100644 --- a/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java +++ b/engine/src/main/java/org/terasology/engine/core/internal/TimeBase.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.internal; import com.google.common.util.concurrent.AtomicDouble; diff --git a/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java b/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java index 572f90fdaf1..6d7f9b0c460 100644 --- a/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java +++ b/engine/src/main/java/org/terasology/engine/core/internal/TimeLwjgl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.internal; import org.lwjgl.glfw.GLFW; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/GameState.java b/engine/src/main/java/org/terasology/engine/core/modes/GameState.java index 6fc482e9824..cee0b77dc0a 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/GameState.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/GameState.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java index 0092e75928d..2c00f0bfbc6 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/LoadProcess.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; -/** - */ public interface LoadProcess { /** diff --git a/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java index 3204e840c19..3a89ba2e9e6 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/SingleStepLoadProcess.java @@ -1,22 +1,7 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; -/** - */ public abstract class SingleStepLoadProcess implements LoadProcess { @Override diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java b/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java index a6212837bb6..5ec94ad180b 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; import org.terasology.engine.audio.AudioManager; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java b/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java index 986e85d3f97..f6ea5ff83de 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java b/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java index 0a61fd6124b..da49c23380d 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StateMainMenu.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java index 7948f0a8102..2795c1d6ac1 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/StepBasedLoadProcess.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; /** diff --git a/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java b/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java index cb7809b8146..90f3e7410c8 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/VariableStepLoadProcess.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes; /** diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java index 2a979890d10..96bfdf470c5 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitCharacterSpawn.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java index fe641205bae..a180de6f260 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java index 2774c5a6861..c9bda386f41 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateRemoteWorldEntity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java index 7386d2865de..633f2b18f60 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/CreateWorldEntity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -34,8 +21,6 @@ import java.util.Iterator; -/** - */ public class CreateWorldEntity extends SingleStepLoadProcess { private static final Logger logger = LoggerFactory.getLogger(CreateWorldEntity.class); diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java index c46f744f4a7..772ba2a189c 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/EnsureSaveGameConsistency.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java index 704ca6d3929..c450cd63547 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseBlockTypeEntities.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java index c0d63ec9d3f..1f4407cb9fa 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseCommandSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java index 72b1d503747..381af374122 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseComponentSystemManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java index cf2156ef2a1..50925a5bce9 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseEntitySystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -20,8 +7,6 @@ import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.modes.SingleStepLoadProcess; -/** - */ public class InitialiseEntitySystem extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java index 0c3cc14949e..2ddd6e90c5c 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseGraphics.java @@ -8,8 +8,6 @@ import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.internal.NUIManagerInternal; -/** - */ public class InitialiseGraphics extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java index b959925c1e9..aeb86b358c5 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialisePhysics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; @@ -21,8 +8,6 @@ import org.terasology.engine.physics.engine.PhysicsEngine; import org.terasology.engine.physics.engine.PhysicsEngineManager; -/** - */ public class InitialisePhysics extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java index fab4809adea..929367ce0aa 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRecordAndReplay.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java index 20f7d8ca46c..8173b35b36e 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseRemoteWorld.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java index d514b851588..0d915a9955f 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -25,8 +12,6 @@ import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.world.BlockEntityRegistry; -/** - */ public class InitialiseSystems extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java index 2f57c162cb8..8089a969648 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorld.java @@ -117,8 +117,10 @@ public boolean step() { RecordAndReplayCurrentStatus recordAndReplayCurrentStatus = context.get(RecordAndReplayCurrentStatus.class); try { storageManager = writeSaveGamesEnabled - ? new ReadWriteStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, extraDataManager, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus) - : new ReadOnlyStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, extraDataManager); + ? new ReadWriteStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, + extraDataManager, recordAndReplaySerializer, recordAndReplayUtils, recordAndReplayCurrentStatus) + : new ReadOnlyStorageManager(saveOrRecordingPath, environment, entityManager, blockManager, + extraDataManager); } catch (IOException e) { logger.error("Unable to create storage manager!", e); context.get(GameEngine.class).changeState(new StateMainMenu("Unable to create storage manager!")); @@ -136,7 +138,8 @@ public boolean step() { context.get(ComponentSystemManager.class).register(relevanceSystem, "engine:relevanceSystem"); chunkProvider.setRelevanceSystem(relevanceSystem); Block unloadedBlock = blockManager.getBlock(BlockManager.UNLOADED_ID); - WorldProviderCoreImpl worldProviderCore = new WorldProviderCoreImpl(worldInfo, chunkProvider, unloadedBlock, context); + WorldProviderCoreImpl worldProviderCore = new WorldProviderCoreImpl(worldInfo, chunkProvider, unloadedBlock, + context); EntityAwareWorldProvider entityWorldProvider = new EntityAwareWorldProvider(worldProviderCore, context); WorldProvider worldProvider = new WorldProviderWrapper(entityWorldProvider, extraDataManager); context.put(WorldProvider.class, worldProvider); @@ -160,7 +163,8 @@ public boolean step() { // TODO: These shouldn't be done here, nor so strongly tied to the world renderer LocalPlayer localPlayer = new LocalPlayer(); - localPlayer.setRecordAndReplayClasses(context.get(DirectionAndOriginPosRecorderList.class), context.get(RecordAndReplayCurrentStatus.class)); + localPlayer.setRecordAndReplayClasses(context.get(DirectionAndOriginPosRecorderList.class), + context.get(RecordAndReplayCurrentStatus.class)); context.put(LocalPlayer.class, localPlayer); context.put(Camera.class, worldRenderer.getActiveCamera()); diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java index 82b890e9bce..994b137d402 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/InitialiseWorldGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java index 19b47b07259..77a1dc0de69 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/JoinServer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java index 9d429eda354..785100b4f24 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadEntities.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java index a5f8f19d963..7f7cddb7bef 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadExtraBlockData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java index 823568dbef4..a23c640b95c 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadPrefabs.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java index d54f2b267a1..604854f0936 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java index 46b2f06a36c..12ffd4269ed 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PostBeginSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java index 1346928ead2..3cdf4201e0a 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PreBeginSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java index 486f3a3d113..f5569022be4 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/PrepareWorld.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -60,7 +47,7 @@ public void begin() { @Override public float getProgress() { - return (1/Math.max(1f, 5000f / (float) timeElapsed)); + return (1 / Math.max(1f, 5000f / (float) timeElapsed)); } @Override diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java index 8126ef6ac52..8f3901eeec1 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/ProcessBlockPrefabs.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; @@ -22,8 +9,6 @@ import org.terasology.engine.world.block.internal.BlockManagerImpl; import org.terasology.engine.world.block.internal.BlockPrefabManager; -/** - */ public class ProcessBlockPrefabs extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java index efecf6c202b..15c7aae8b08 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlockFamilies.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java index 9a37a1e7786..ce2afcbff67 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterBlocks.java @@ -22,8 +22,6 @@ import org.terasology.gestalt.module.ModuleEnvironment; import org.terasology.persistence.typeHandling.TypeHandlerLibrary; -/** - */ public class RegisterBlocks extends SingleStepLoadProcess { private final Context context; private final GameManifest gameManifest; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java index b71a4dd6319..88cdc401d09 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterInputSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -23,8 +10,6 @@ import org.terasology.engine.input.cameraTarget.CameraTargetSystem; import org.terasology.engine.logic.players.LocalPlayerSystem; -/** - */ public class RegisterInputSystem extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java index 83fef13f4cc..d8d42b639c3 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterMods.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -36,8 +23,6 @@ import java.util.List; import java.util.stream.Collectors; -/** - */ public class RegisterMods extends SingleStepLoadProcess { private static final Logger logger = LoggerFactory.getLogger(RegisterMods.class); diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java index 7776d58d8a7..668ef91ab62 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/RegisterSystems.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -25,8 +12,6 @@ import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.network.NetworkMode; -/** - */ public class RegisterSystems extends SingleStepLoadProcess { private final Context context; private final NetworkMode netMode; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java index 01dc362f4e8..d4954b35e7b 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupLocalPlayer.java @@ -10,8 +10,6 @@ import org.terasology.engine.network.Client; import org.terasology.engine.network.NetworkSystem; -/** - */ public class SetupLocalPlayer extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java index 4178467f303..e05ade91367 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/SetupRemotePlayer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -23,8 +10,6 @@ import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.network.internal.NetworkSystemImpl; -/** - */ public class SetupRemotePlayer extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java index 6f38e113aef..316db292f31 100644 --- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java +++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/StartServer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.modes.loadProcesses; @@ -24,8 +11,6 @@ import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.layers.mainMenu.MessagePopup; -/** - */ public class StartServer extends SingleStepLoadProcess { private final Context context; diff --git a/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java b/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java index d54f14075c2..d61ad483819 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java +++ b/engine/src/main/java/org/terasology/engine/core/module/DependencyResolutionFailedException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; public class DependencyResolutionFailedException extends Exception { diff --git a/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java index 9a9349976ad..fa8aa84cca3 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ExtraDataModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.gestalt.module.Module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java index 095d91aa1c2..1f5b780ba02 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleContext.java @@ -1,26 +1,11 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.engine.registry.CoreRegistry; import org.terasology.gestalt.module.Module; import org.terasology.gestalt.naming.Name; -/** - */ public final class ModuleContext { private static ThreadLocal context = new ThreadLocal<>(); diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java index 46d92ea92b5..a306c370bf4 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleDownloadListGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.engine.core.TerasologyConstants; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java index da90f488c30..6d93b741b96 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java index ebf08c196c3..7533f921f3e 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java index a6a14b75508..2f63ba1e971 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleInstallManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.engine.utilities.download.MultiFileTransferProgressListener; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java index 7bf974fcd59..6cb1730c3b8 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java index a6354466850..3667eb24386 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java +++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java index a53d55b82bd..1b89b0acea3 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/RemoteModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java b/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java index be4f1c9a7d8..071ae0996e8 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java +++ b/engine/src/main/java/org/terasology/engine/core/module/StandardModuleExtension.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; diff --git a/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java b/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java index 6b9b1a59a15..0df183681ea 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java +++ b/engine/src/main/java/org/terasology/engine/core/module/UriUtil.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module; import java.util.Locale; -/** - */ public final class UriUtil { private UriUtil() { diff --git a/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java b/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java index 5045c94c31f..c5bffcddc51 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java +++ b/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.module.rendering; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java b/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java index 7dfcd1db390..97bb7303e97 100644 --- a/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java +++ b/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.core.module.rendering; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java index b4522d5abf7..26c2c659838 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java index 33e9c303155..df9016015a8 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDeviceInfo.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java index 5c4aaade469..151b3b61c2a 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/EngineSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java b/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java index 57f58e81c07..63ac74742fd 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/RenderingSubsystemFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java b/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java index 1148fcd781b..a43f2923671 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/Resolution.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem; public interface Resolution { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java index e2a4d1ddd4b..8babda7e263 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/CommandSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.logic.console.commandSystem.adapter.ParameterAdapterManager; -/** - * - */ + public class CommandSubsystem implements EngineSubsystem { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java index de242db00f1..388704358c8 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/GameSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.game.Game; -/** - * - */ + // TODO: Get rid of this subsystem, it is kind of silly (remove Game class, convert to entity?) public class GameSubsystem implements EngineSubsystem { @Override diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java index 10b10586b1e..30fb518f73c 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/MonitoringSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.config.SystemConfig; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java index e352c9da5b6..779693879c1 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/NetworkSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -24,9 +11,7 @@ import org.terasology.engine.network.internal.NetworkSystemImpl; import org.terasology.engine.network.internal.ServerConnectListManager; -/** - * - */ + public class NetworkSubsystem implements EngineSubsystem { private NetworkSystem networkSystem; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java index 9ca332433c9..d2054efafa1 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/PhysicsSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.physics.CollisionGroupManager; -/** - * - */ + public class PhysicsSubsystem implements EngineSubsystem { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java index 0c2c0b4ccc3..3b02f06dfa8 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TelemetrySubSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import ch.qos.logback.classic.LoggerContext; @@ -37,9 +24,12 @@ import static org.terasology.engine.telemetry.TelemetryEmitter.DEFAULT_COLLECTOR_PROTOCOL; /** - * This is a telemetry engine sub system. - * It will initialise all the telemetry stuff such as the {@link com.snowplowanalytics.snowplow.tracker.emitter.Emitter} and configure the {@link org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender}. - * It will also adds the {@link org.terasology.engine.telemetry.Metrics} and the {@link org.terasology.engine.telemetry.TelemetryEmitter} to the context so that we can be use them later in other class for telemetry. + * This is a telemetry engine sub system. It will initialise all the telemetry stuff such as the {@link + * com.snowplowanalytics.snowplow.tracker.emitter.Emitter} and configure the {@link + * org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender}. It will also adds the {@link + * org.terasology.engine.telemetry.Metrics} and the {@link org.terasology.engine.telemetry.TelemetryEmitter} to the + * context so that we can be use them later in other class for telemetry. + * * @see https://github.com/GabrielXia/telemetry/wiki */ public class TelemetrySubSystem implements EngineSubsystem { @@ -91,7 +81,8 @@ private void addTelemetryLogstashAppender(Context rootContext) { TelemetryConfig telemetryConfig = config.getTelemetryConfig(); String errorReportingDestination = telemetryConfig.getErrorReportingDestination(); if (errorReportingDestination == null) { - errorReportingDestination = TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST + ":" + TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT; + errorReportingDestination = + TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST + ":" + TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT; telemetryConfig.setErrorReportingDestination(errorReportingDestination); } if (telemetryConfig.isErrorReportingEnabled()) { @@ -117,7 +108,7 @@ private void setTelemetryDestination(Context rootContext) { DEFAULT_COLLECTOR_PROTOCOL, DEFAULT_COLLECTOR_HOST, DEFAULT_COLLECTOR_PORT).toString()); } } - + @Override public void shutdown() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java index 842a5a725c4..c7ad6d73af0 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java index 4d563fac045..3388ca5e810 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManagerSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.slf4j.Logger; @@ -27,8 +14,6 @@ import java.util.concurrent.RejectedExecutionException; -/** - */ public class ThreadManagerSubsystem implements EngineSubsystem, ThreadManager { private static final int MAX_NUMBER_THREADS = 16; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java index fffe512b51d..687abd31e68 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/TimeSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.core.EngineTime; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java index 7029a44d23d..2fcc2f0c000 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/WorldGenerationSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common; import org.terasology.engine.context.Context; @@ -20,9 +7,7 @@ import org.terasology.engine.core.subsystem.EngineSubsystem; import org.terasology.engine.world.generator.internal.WorldGeneratorManager; -/** - * - */ + public class WorldGenerationSubsystem implements EngineSubsystem { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java index 7feacafb514..fc6909ecffb 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java @@ -1,25 +1,10 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common.hibernation; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class HibernationManager { private boolean hibernationAllowed = true; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java index fe06b88dc04..f25be210dd3 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.common.hibernation; import org.slf4j.Logger; @@ -22,9 +9,7 @@ import org.terasology.engine.core.subsystem.DisplayDevice; import org.terasology.engine.core.subsystem.EngineSubsystem; -/** - * - */ + public class HibernationSubsystem implements EngineSubsystem { private static final Logger logger = LoggerFactory.getLogger(HibernationSubsystem.class); private HibernationManager hibernationManager; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java index 85dd911115a..a28194a834b 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsManager.java @@ -1,4 +1,7 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.core.subsystem.config; import org.terasology.engine.config.BindsConfig; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java index 1b73eba8515..cc028378528 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/config/BindsSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.config; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java index f410b900085..83aaf7d0692 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessGraphics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java index cfb7e92128b..52ec44fd912 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessInput.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java index ff149a6bf0d..26d3dff59e0 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/HeadlessTimer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java index af5bcc529c9..6057d7fe62b 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMaterial.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import org.joml.Matrix3fc; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java index cb4029ea6c9..59f15a93ff5 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessMesh.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import gnu.trove.list.TFloatList; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java index 805de17da67..7b7a446cafd 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessShader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import org.terasology.engine.rendering.assets.shader.Shader; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java index f6588359421..df2006f58d4 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessSkeletalMesh.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import org.terasology.engine.rendering.assets.skeletalmesh.Bone; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java index 455d4ce3631..a43db95a2e3 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/assets/HeadlessTexture.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.assets; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java index 9b41e8be295..c12d31ef4c0 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessDisplayDevice.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.device; import org.terasology.engine.core.subsystem.DisplayDevice; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java index ab1bfcfce26..da61f2fc282 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/HeadlessResolution.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.device; import org.terasology.engine.core.subsystem.Resolution; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java index 520c9912b8d..a0c48a60ff2 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/device/TimeSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.device; import org.terasology.engine.core.internal.TimeBase; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java index 84183277f16..2cf634355b2 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/HeadlessStateChangeListener.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.mode; import org.terasology.engine.core.StateChangeSubscriber; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java index 5d96deac32e..ce3c01478ab 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/mode/StateHeadlessSetup.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.mode; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java index fe712cd6ba4..fde0457ceca 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessCanvasRenderer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java index 6abf98dfdcf..ccd59aa7433 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/HeadlessRenderingSubsystemFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java index 01aee972bab..2c8d0ab9b86 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/NullCamera.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; import org.terasology.engine.config.RenderingConfig; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java index d015322e263..141d6f8a368 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/headless/renderer/ShaderManagerHeadless.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.headless.renderer; import org.terasology.engine.rendering.ShaderManager; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java index b9b7f934dee..4d557769a83 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/BaseLwjglSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import com.google.common.base.Charsets; @@ -25,9 +12,7 @@ import java.io.PrintStream; import java.io.UnsupportedEncodingException; -/** - * - */ + public abstract class BaseLwjglSubsystem implements EngineSubsystem { private static final Logger logger = LoggerFactory.getLogger(BaseLwjglSubsystem.class); diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java index 4760388a2bf..0fb8769e6ba 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/DebugCallback.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.lwjgl.system.MemoryUtil; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java index 5c3d7048fac..58022aba1db 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/GLFWErrorCallback.java @@ -1,3 +1,6 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java index b8076959987..689bdf3356b 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/Lwjgl2Sync.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java index 3899b0cd92f..e579a881d2b 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglDisplayDevice.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import com.google.common.base.Suppliers; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java index 8134ca39388..29b1e877ff9 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphics.java @@ -99,7 +99,7 @@ public void preShutdown() { int[] heightBuffer = new int[1]; GLFW.glfwGetWindowSize(window, widthBuffer, heightBuffer); - if (widthBuffer[0]>0 && heightBuffer[0]>0 && xBuffer[0]>0 && yBuffer[0]>0) { + if (widthBuffer[0] > 0 && heightBuffer[0] > 0 && xBuffer[0] > 0 && yBuffer[0] > 0) { config.setWindowWidth(widthBuffer[0]); config.setWindowHeight(heightBuffer[0]); config.setWindowPosX(xBuffer[0]); diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java index 4deee0cfdb8..b71b200f9fb 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java index c3021d18238..d161ab02e13 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsProcessing.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java index dd1e618ef6a..10259acd023 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglGraphicsUtil.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.lwjgl.BufferUtils; @@ -40,9 +27,7 @@ import static org.lwjgl.opengl.GL11.glDepthFunc; import static org.lwjgl.opengl.GL11.glEnable; -/** - * - */ + public final class LwjglGraphicsUtil { private LwjglGraphicsUtil() { } diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java index 2829bcbaf4a..77245b4db04 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglInput.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java index 917c96c3179..18e87516fd9 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglRenderingSubsystemFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java index 758772e7c3f..e9d4f005928 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglResolution.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java index 91c167b7c5e..bb568dda560 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/lwjgl/LwjglTimer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.lwjgl; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java index 8d7abcccb36..87f75259192 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRControllers.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.openvr; import jopenvr.VRControllerState_t; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java index ed0a20b57bd..65e245629b6 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/openvr/OpenVRInput.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.openvr; import org.lwjgl.glfw.GLFW; diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java b/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java index 236a405b254..d300558d5e8 100644 --- a/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/core/subsystem/rendering/ModuleRenderingSubsystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.core.subsystem.rendering; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/Component.java b/engine/src/main/java/org/terasology/engine/entitySystem/Component.java index 66dc9f8fdc6..70eef49bba0 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/Component.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/Component.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java b/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java index 822ceb6d774..4ab51cf4286 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/ComponentContainer.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; import java.util.List; -/** - */ public interface ComponentContainer { /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java b/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java index 08a0efad1ec..a97a36f4957 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/MutableComponentContainer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; import java.util.Optional; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java b/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java index 7e6a325607d..58d993eef20 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/Owns.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java index 75676102d9e..08cb56b8251 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java index c1608971e72..27c5d25c66e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import org.joml.Quaternionfc; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java index 3a722cfaedd..f4c64b918a4 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import com.google.common.base.Objects; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java index 87c4623b625..fe3a4922e3a 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityStore.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java index 06a61f3f859..1c208615f75 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/LowLevelEntityManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java index b2d1abc96d0..e206778fc0f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/SectorManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity; public interface SectorManager extends EntityPool { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java index c0d7f12054e..15b955e1a18 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.slf4j.Logger; @@ -36,8 +23,6 @@ import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.SECTOR; -/** - */ public abstract class BaseEntityRef extends EntityRef { private static final Logger logger = LoggerFactory.getLogger(BaseEntityRef.class); diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java index b870be6737d..2201e9bd0ff 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/ComponentTable.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java index ff49f884480..95bb99fc4dc 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/DefaultRefStrategy.java @@ -1,24 +1,9 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; -/** - */ public class DefaultRefStrategy implements RefStrategy { @Override public BaseEntityRef createRefFor(long id, LowLevelEntityManager entityManager) { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java index 44c24514bf0..973e839bebb 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineEntityPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java index 817a362c92b..f217dca2eb9 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EngineSectorManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.SectorManager; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java index 07d18ecf8f9..612c4930eca 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityChangeSubscriber.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java index e8399c366e4..53aa28f6760 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityDestroySubscriber.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java index 5a1ce1a7f86..b0aabe4d3d9 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityInfoComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java index 7c19845fb1b..958d4f25556 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityIterator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import gnu.trove.iterator.TLongIterator; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java index 5a70c7c4f96..e723c2a0e3f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java index 9e42a31d88e..d2ef1c28bdf 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java index 37ac39db384..f4041f8e296 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/OwnershipHelper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Sets; @@ -26,8 +13,6 @@ import java.util.Map; import java.util.Set; -/** - */ public final class OwnershipHelper { private ComponentLibrary componentLibrary; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java index c725d500e06..804a995ffe0 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityPool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java index 4a569040205..96d3b7f92bb 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.EntityRef; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.engine.network.NetworkComponent; -/** - */ public class PojoEntityRef extends BaseEntityRef { private long id; private boolean exists = true; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java index c50045eec0c..0c4f387be62 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/PojoSectorManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import com.google.common.collect.Iterables; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java index 36de7adbe27..6888d21f80e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/RefStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java index 2d3b6f30a3e..0c3d5afe6f5 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/WorldManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.internal; import org.terasology.engine.world.internal.WorldInfo; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java index b5619a90536..627d12b6798 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java index 12d132c965b..f894882bd9e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java index e4bb555f444..fcb40e8baae 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java index 43c274a8966..be370490420 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java index b33ca3e2a7e..f1c7642a04e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java index 20158247980..8eb63bb7426 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java index 73cbf571b2e..a922e5f8635 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.entity.lifecycleEvents; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java index 7e64f69c7d4..b46b310f368 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.entity; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java index 5ff66b9fffa..287cb0cadaf 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableEvent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import org.terasology.engine.network.NoReplicate; -/** - */ public abstract class AbstractConsumableEvent implements ConsumableEvent { @NoReplicate protected boolean consumed; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java index 202f70f004a..df57fc0b775 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractConsumableValueModifiableEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import org.terasology.engine.network.NoReplicate; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java index beefff42b4a..895bdba84ae 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import gnu.trove.iterator.TFloatIterator; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java index 05c0fb2ae63..e15525230ee 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java index 43e7876ca18..1d57ab88dfd 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java index b6d3e1bece0..2981525854b 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java index 7bb9fe1ef00..7ca73a7e6be 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/EventPriority.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; -/** - */ public final class EventPriority { public static final int PRIORITY_CRITICAL = 200; public static final int PRIORITY_HIGH = 150; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java index 15e9e1a60e5..663af160ae4 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/PendingEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java index 2fcd1a2aef8..ba80259c8af 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/ReceiveEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java index c7a4c8d7d4a..1cca11746ec 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventReceiver.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event.internal; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java index a395ff77442..9aeaa6be585 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystem.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.event.internal; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java index 560305a6025..f921d0e2f37 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/internal/EventSystemImpl.java @@ -17,7 +17,6 @@ import org.reflections.ReflectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; @@ -26,22 +25,9 @@ import org.terasology.engine.entitySystem.event.EventPriority; import org.terasology.engine.entitySystem.event.PendingEvent; import org.terasology.engine.entitySystem.event.ReceiveEvent; -import org.terasology.engine.entitySystem.metadata.EventLibrary; -import org.terasology.engine.entitySystem.metadata.EventMetadata; import org.terasology.engine.entitySystem.systems.ComponentSystem; import org.terasology.engine.monitoring.PerformanceMonitor; -import org.terasology.engine.network.BroadcastEvent; -import org.terasology.engine.network.Client; -import org.terasology.engine.network.NetworkComponent; -import org.terasology.engine.network.NetworkEvent; -import org.terasology.engine.network.NetworkMode; -import org.terasology.engine.network.NetworkSystem; -import org.terasology.engine.network.OwnerEvent; -import org.terasology.engine.network.ServerEvent; -import org.terasology.engine.recording.EventCatcher; -import org.terasology.engine.recording.RecordAndReplayCurrentStatus; -import org.terasology.engine.recording.RecordAndReplayStatus; -import org.terasology.engine.world.block.BlockComponent; +import org.terasology.gestalt.assets.ResourceUrn; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java index 0d446cb5257..f8aeba57dca 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java index d65f0854ddc..94d8c56dba2 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentFieldMetadata.java @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; -import org.terasology.reflection.copy.CopyStrategyLibrary; -import org.terasology.engine.reflection.copy.strategy.EntityCopyStrategy; -import org.terasology.reflection.metadata.ClassMetadata; -import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.reflect.InaccessibleFieldException; -import org.terasology.reflection.reflect.ReflectFactory; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.Owns; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.reflection.copy.strategy.EntityCopyStrategy; import org.terasology.engine.utilities.ReflectionUtil; +import org.terasology.reflection.copy.CopyStrategy; +import org.terasology.reflection.copy.CopyStrategyLibrary; +import org.terasology.reflection.metadata.ClassMetadata; +import org.terasology.reflection.reflect.InaccessibleFieldException; +import org.terasology.reflection.reflect.ReflectFactory; import java.lang.reflect.Field; import java.lang.reflect.Type; @@ -34,7 +34,8 @@ public ComponentFieldMetadata(ClassMetadata owner, Field field, CopyStrate ownedReference = field.getAnnotation(Owns.class) != null && (EntityRef.class.isAssignableFrom(field.getType()) || isCollectionOf(EntityRef.class, field.getGenericType())); if (ownedReference) { - copyWithOwnedEntitiesStrategy = (CopyStrategy) copyStrategyLibrary.createCopyOfLibraryWithStrategy(EntityRef.class, EntityCopyStrategy.INSTANCE).getStrategy(field.getGenericType()); + copyWithOwnedEntitiesStrategy = + (CopyStrategy) copyStrategyLibrary.createCopyOfLibraryWithStrategy(EntityRef.class, EntityCopyStrategy.INSTANCE).getStrategy(field.getGenericType()); } else { copyWithOwnedEntitiesStrategy = copyStrategy; } @@ -53,8 +54,9 @@ private boolean isCollectionOf(Class targetType, Type genericType) { } /** - * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. - * Otherwise it behaves the same as getValue + * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field + * from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. Otherwise it + * behaves the same as getValue * * @param from The object to copy the field from * @return A safe to use copy of the value of this field in the given object @@ -65,9 +67,9 @@ public U getCopyOfValueWithOwnedEntities(Object from) { } /** - * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. - * Otherwise it behaves the same as getValue - * This method is checked to conform to the generic parameters of the FieldMetadata + * For types that need to be copied (e.g. Vector3f) for safe usage, this method will create a new copy of a field + * from an object, and if the field is marked @Owns, any EntityRefs in the value are copied too. Otherwise it + * behaves the same as getValue This method is checked to conform to the generic parameters of the FieldMetadata * * @param from The object to copy the field from * @return A safe to use copy of the value of this field in the given object diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java index 3f963269ce3..e8eaa601b0d 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentLibrary.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.collect.Iterables; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java index 659908e9b72..4f2ca4b53be 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ComponentMetadata.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.base.Predicates; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java index c96b77df1dd..95dc4ccd890 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventLibrary.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java index 412ebc5712e..0b859058991 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/EventMetadata.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import com.google.common.base.Predicates; @@ -31,8 +18,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; -/** - */ public class EventMetadata extends ClassMetadata> { private static final Logger logger = LoggerFactory.getLogger(EventMetadata.class); diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java index acf703f4b31..cd1d465393e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/MetadataUtil.java @@ -1,26 +1,11 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import org.terasology.engine.entitySystem.Component; import java.util.Locale; -/** - */ public final class MetadataUtil { private MetadataUtil() { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java index 119b16b5057..d9ea67778e2 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/NetworkEventType.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; -/** - */ public enum NetworkEventType { /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java index db9c343f9ba..cc611250144 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/ReplicatedFieldMetadata.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.metadata; import org.terasology.reflection.copy.CopyStrategyLibrary; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java index 2725aec733b..b44505b9a90 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 /** * This package contains metadata classes for the types important to the entity system - components and events. diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java index 831b2921779..98d1a14a792 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java index e6d4f5d04c1..11c51fd8229 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/Prefab.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab; import org.terasology.gestalt.assets.Asset; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java index 87de49a48f0..a9e42f0dda4 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab; import com.google.common.collect.Maps; @@ -24,8 +11,6 @@ import java.util.List; import java.util.Map; -/** - */ public class PrefabData implements MutableComponentContainer, AssetData { private Map, Component> components = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java index b58c75cbe1d..91ae1d72fa6 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/PrefabManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java index a04a3f24571..98b7f6f4e20 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefab.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab.internal; import com.google.common.collect.ImmutableList; @@ -28,8 +15,6 @@ import java.util.List; import java.util.Map; -/** - */ public class PojoPrefab extends Prefab { private Prefab parent; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java index 2a17b65eff8..d409c3467de 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PojoPrefabManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.prefab.internal; import com.google.common.base.Strings; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java index bf6be109b9a..b18823c686d 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/internal/PrefabDeltaFormat.java @@ -16,8 +16,6 @@ import java.io.IOException; import java.io.InputStreamReader; -/** - */ public class PrefabDeltaFormat extends AbstractAssetAlterationFileFormat { private final ComponentLibrary componentLibrary; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java index 0aeb748522d..49b680cb7aa 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.prefab; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java index c166917a2d4..f9fa8df4983 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.joml.Vector3i; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java index 45a4f678c60..e78cb9935d2 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityLoad.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java index fafc086d6de..ac550590ee7 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorEntityUnload.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java index 620eaf455ad..d14e5eff762 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.joml.Vector3i; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java index d542644dcbb..734d9ff750d 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java index 0a49f090c92..caf69c51f71 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java index 871c97103df..d88acb1d440 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.terasology.engine.core.Time; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java index b6ce3dc3cb7..8bc87fdb6d1 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.sectors; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java index cf670a43ee4..bf1e49d1887 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/BaseComponentSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java index a47ff7ab3d5..62364300057 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/ComponentSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; public interface ComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java index e84ffb9ffe4..e1a20a6fc25 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterMode.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java index a76c55fa44e..8fcef4192de 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java index 44aa5a7bcc0..3c3a2fac87e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RenderSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; /** diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java index ba3a967c65e..a26713afc57 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/UpdateSubscriberSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems; import org.terasology.engine.logic.delay.DelayManager; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java index 5fde31d3350..a206e14d52e 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/internal/DoNotAutoRegister.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.entitySystem.systems.internal; import java.lang.annotation.ElementType; diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java index 32962c9f8d5..f9ad9cdfd5f 100644 --- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java +++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.entitySystem.systems; diff --git a/engine/src/main/java/org/terasology/engine/game/Game.java b/engine/src/main/java/org/terasology/engine/game/Game.java index 1a6c65d813a..00e43927e07 100644 --- a/engine/src/main/java/org/terasology/engine/game/Game.java +++ b/engine/src/main/java/org/terasology/engine/game/Game.java @@ -1,22 +1,7 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.game; -/** - */ public class Game { private String name = ""; diff --git a/engine/src/main/java/org/terasology/engine/game/GameManifest.java b/engine/src/main/java/org/terasology/engine/game/GameManifest.java index 6b928f926eb..111ca0d97be 100644 --- a/engine/src/main/java/org/terasology/engine/game/GameManifest.java +++ b/engine/src/main/java/org/terasology/engine/game/GameManifest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.game; import com.google.common.collect.ImmutableList; @@ -41,8 +28,6 @@ import java.util.List; import java.util.Map; -/** - */ public class GameManifest { public static final String DEFAULT_FILE_NAME = "manifest.json"; diff --git a/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java b/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java index 2a3804d8531..a600b752349 100644 --- a/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java +++ b/engine/src/main/java/org/terasology/engine/identity/BadEncryptedDataException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java b/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java index f1a30c90635..2fe899f09b5 100644 --- a/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java +++ b/engine/src/main/java/org/terasology/engine/identity/CertificateGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import com.google.common.base.Charsets; diff --git a/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java b/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java index f3b602da5ed..dc95b041bff 100644 --- a/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java +++ b/engine/src/main/java/org/terasology/engine/identity/CertificatePair.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java b/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java index 5f50f84fc09..b481710a49f 100644 --- a/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java +++ b/engine/src/main/java/org/terasology/engine/identity/ClientIdentity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.terasology.engine.config.SecurityConfig; diff --git a/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java b/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java index b2294712762..1b72fac35f0 100644 --- a/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java +++ b/engine/src/main/java/org/terasology/engine/identity/IdentityConstants.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java b/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java index 4fb50aedec9..19d423e142b 100644 --- a/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java +++ b/engine/src/main/java/org/terasology/engine/identity/PrivateIdentityCertificate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; diff --git a/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java b/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java index 7cf1a91359a..13c0913eb06 100644 --- a/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java +++ b/engine/src/main/java/org/terasology/engine/identity/PublicIdentityCertificate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; diff --git a/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java b/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java index 2f60c52e0c8..16f4a5da160 100644 --- a/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java +++ b/engine/src/main/java/org/terasology/engine/identity/SecretGenerator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity; import org.terasology.math.TeraMath; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java index 74e26475876..a5b41b7169c 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/APISession.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java index 23ac6962dfa..789ce512df1 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/Action.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; /** diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java index 0872039f208..844a63bf361 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/BigIntegerBase64Serializer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.gson.JsonSerializer; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java index 0fbb11296fc..f6cb8299947 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/HttpMethod.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public enum HttpMethod { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java index 0170da0779c..c65e909b613 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityBundle.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java index 69a07931356..880f12d87ee 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflict.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java index f67c3c5f045..2bcf3161269 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/IdentityConflictSolution.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public enum IdentityConflictSolution { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java index c2332768bb5..acd5c50837c 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/InitializeFromTokenAction.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; -/** - */ final class InitializeFromTokenAction implements Action { @Override diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java index 8680df74319..1e1fcb26427 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LoginAction.java @@ -1,24 +1,9 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import java.net.URL; -/** - */ final class LoginAction implements Action { private final URL serviceURL; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java index a8bcac464a4..6e4b4bf123f 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/LogoutAction.java @@ -1,22 +1,7 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; -/** - */ final class LogoutAction implements Action { private boolean deleteLocalIdentities; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java index 6f47b505af7..2620e63dbf4 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/PutIdentityAction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.identity.ClientIdentity; @@ -20,8 +7,6 @@ import java.util.Map; -/** - */ final class PutIdentityAction implements Action { private final Map identities; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java index e8d16a4e547..e2a3ed4babd 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/ServiceApiRequest.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java index 0c330c36eaf..88272c21ecd 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StatusMessageTranslator.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import org.terasology.engine.i18n.TranslationSystem; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java index 7575957508b..6054c5d2355 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public class StorageServiceException extends Exception { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java index 1be1a1de97b..42332fe82d2 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorker.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.common.collect.ImmutableMap; @@ -36,9 +23,9 @@ import java.util.concurrent.LinkedBlockingDeque; /** - * The public interface to this package. Manages a communication session with the storage service server, - * can answer for status information queries and can perform asynchronous operations on the storage service. - * This class can be in two states, with the default being "logged out". + * The public interface to this package. Manages a communication session with the storage service server, can answer for + * status information queries and can perform asynchronous operations on the storage service. This class can be in two + * states, with the default being "logged out". */ public final class StorageServiceWorker { @@ -94,7 +81,8 @@ private synchronized void performAction(Action action, StorageServiceWorkerStatu public void flushNotificationsToConsole(Console target) { while (!notificationBuffer.isEmpty()) { ConsoleNotification notification = notificationBuffer.pop(); - String message = translationSystem.translate("${engine:menu#storage-service}") + ": " + String.format(translationSystem.translate(notification.messageId), notification.args); + String message = + translationSystem.translate("${engine:menu#storage-service}") + ": " + String.format(translationSystem.translate(notification.messageId), notification.args); target.addMessage(message, CoreMessageType.NOTIFICATION); } } @@ -108,16 +96,16 @@ public String getLoginName() { } /** - * Tries to initialize the session using the parameters (host URL and session token) read from configuration. - * The session token is verified against the server; if it's valid, the status is switched to logged in. + * Tries to initialize the session using the parameters (host URL and session token) read from configuration. The + * session token is verified against the server; if it's valid, the status is switched to logged in. */ public void initializeFromConfig() { performAction(new InitializeFromTokenAction(), StorageServiceWorkerStatus.LOGGED_OUT); } /** - * Tries to login with the specified credentials; on success, the status is switched to logged in - * and the parameters are stored in configuration. + * Tries to login with the specified credentials; on success, the status is switched to logged in and the parameters + * are stored in configuration. */ public void login(URL serviceURL, String login, String password) { performAction(new LoginAction(serviceURL, login, password), StorageServiceWorkerStatus.LOGGED_OUT); @@ -125,6 +113,7 @@ public void login(URL serviceURL, String login, String password) { /** * Destroys the current session and switches to the logged out status. + * * @param deleteLocalIdentities whether the locally stored identities should be deleted or not. */ public void logout(boolean deleteLocalIdentities) { @@ -161,19 +150,21 @@ public boolean hasConflictingIdentities() { */ public IdentityConflict getNextConflict() { IdentityBundle entry = conflictingRemoteIdentities.peekFirst(); - return new IdentityConflict(entry.getServer(), securityConfig.getIdentity(entry.getServer()), entry.getClient()); + return new IdentityConflict(entry.getServer(), securityConfig.getIdentity(entry.getServer()), + entry.getClient()); } /** - * @param solution the strategy to resolve the conflict returned by the latest call to {@link #getNextConflict()}. - * If there are no more conflicts and some of the solved conflicts must keep the local version, the uploads are performed asynchronously. + * @param solution the strategy to resolve the conflict returned by the latest call to {@link + * #getNextConflict()}. If there are no more conflicts and some of the solved conflicts must keep the local + * version, the uploads are performed asynchronously. */ public void solveNextConflict(IdentityConflictSolution solution) { IdentityBundle entry = conflictingRemoteIdentities.removeFirst(); PublicIdentityCertificate server = entry.getServer(); ClientIdentity remote = entry.getClient(); ClientIdentity local = securityConfig.getIdentity(server); - switch(solution) { + switch (solution) { case KEEP_LOCAL: //save for upload (remote will be overwritten) conflictSolutionsToUpload.put(server, local); break; @@ -193,6 +184,7 @@ public void solveNextConflict(IdentityConflictSolution solution) { private static final class ConsoleNotification { private String messageId; private Object[] args; + private ConsoleNotification(String messageId, Object[] args) { this.messageId = messageId; this.args = args; diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java index 96eaf37bfc0..66414435243 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/StorageServiceWorkerStatus.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; public enum StorageServiceWorkerStatus { diff --git a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java index dfc5d42c9ab..e7628f9ebd2 100644 --- a/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java +++ b/engine/src/main/java/org/terasology/engine/identity/storageServiceClient/SyncIdentitiesAction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.identity.storageServiceClient; import com.google.common.collect.MapDifference; @@ -22,8 +9,6 @@ import java.util.Map; -/** - */ final class SyncIdentitiesAction implements Action { @Override diff --git a/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java b/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java index ad8b5002b3c..64a15f7cc70 100644 --- a/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/BindAxisEvent.java @@ -5,8 +5,6 @@ import org.terasology.engine.input.events.AxisEvent; -/** - */ public class BindAxisEvent extends AxisEvent { private String id; diff --git a/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java b/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java index fa424cf967d..91ccde6b5dd 100644 --- a/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/BindButtonEvent.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.events.ButtonEvent; import org.terasology.input.ButtonState; -/** - */ public class BindButtonEvent extends ButtonEvent { private SimpleUri id; diff --git a/engine/src/main/java/org/terasology/engine/input/BindableButton.java b/engine/src/main/java/org/terasology/engine/input/BindableButton.java index 27ad321fa8f..2c719c7d8e8 100644 --- a/engine/src/main/java/org/terasology/engine/input/BindableButton.java +++ b/engine/src/main/java/org/terasology/engine/input/BindableButton.java @@ -11,8 +11,6 @@ import org.terasology.input.ButtonState; import org.terasology.input.Input; -/** - */ public interface BindableButton { /** diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java b/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java index 864f58de6e3..bbf4c5b6409 100644 --- a/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java @@ -8,8 +8,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterBindAxis { diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java b/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java index 4b40efb00d7..f800bc4b4f0 100644 --- a/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java +++ b/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java @@ -10,8 +10,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterBindButton { diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java b/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java index 217ae68c467..ca283164852 100644 --- a/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java @@ -8,8 +8,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterRealBindAxis { diff --git a/engine/src/main/java/org/terasology/engine/input/SendEventMode.java b/engine/src/main/java/org/terasology/engine/input/SendEventMode.java index d6a6e1ae032..22af1a804fb 100644 --- a/engine/src/main/java/org/terasology/engine/input/SendEventMode.java +++ b/engine/src/main/java/org/terasology/engine/input/SendEventMode.java @@ -3,8 +3,6 @@ package org.terasology.engine.input; -/** - */ public enum SendEventMode { /** * Send an event every update/frame with the current axis value diff --git a/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java b/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java index 2f11bfc65c1..b4fc4018213 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/general/ConsoleButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "console", description = "${engine:menu#binding-console}", category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.GRAVE) @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.F1) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java b/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java index c86cf5bc149..a23b2afa0da 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/general/HideHUDButton.java @@ -8,8 +8,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "hideHUD", description = "${engine:menu#binding-hide-hud}", category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.H) public class HideHUDButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java b/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java index b43356cae09..3bf978d7703 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/interaction/AttackButton.java @@ -9,8 +9,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterBindButton(id = "attack", description = "${engine:menu#binding-attack}", repeating = true) @DefaultBinding(type = InputType.MOUSE_BUTTON, id = 0) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.ZERO) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java b/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java index de435b7e776..e522e4e6027 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/interaction/FrobButton.java @@ -10,8 +10,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "frob", description = "${engine:menu#binding-frob}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.E) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.FOUR) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java b/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java index 99d7348966f..4929f90fb0e 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java @@ -10,8 +10,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterBindButton(id = "useItem", description = "${engine:menu#binding-use-item}", repeating = true, category = "interaction") @DefaultBinding(type = InputType.MOUSE_BUTTON, id = 1) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.THREE) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java index ccc99dab485..64ef8d5be4f 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/BackwardsButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "backwards", description = "${engine:menu#binding-backwards}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.S) public class BackwardsButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java index 9f2b6fee26a..61e81e21ecb 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "crouch", description = "${engine:menu#binding-crouch}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.LEFT_CTRL) public class CrouchButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java index 692646e14fc..a314eba13bb 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/CrouchModeButton.java @@ -8,8 +8,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "crouchMode", description = "${engine:menu#binding-crouch-mode}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.X) public class CrouchModeButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java index 1ee50519b97..5ba2ead4efc 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "forwards", description = "${engine:menu#binding-forwards}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.W) public class ForwardsButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java index a46757025a9..7c8e652ff75 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsMovementAxis.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.RegisterBindAxis; import org.terasology.engine.input.SendEventMode; -/** - */ @RegisterBindAxis(id = "forwardsMovement", positiveButton = "engine:forwards", negativeButton = "engine:backwards", eventMode = SendEventMode.WHEN_CHANGED) public class ForwardsMovementAxis extends BindAxisEvent { } diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java index d37874b69f5..de69cc978f6 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ForwardsRealMovementAxis.java @@ -10,8 +10,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterRealBindAxis(id = "forwardsRealMovement", eventMode = SendEventMode.WHEN_CHANGED) @DefaultBinding(type = InputType.CONTROLLER_AXIS, id = ControllerId.Y_AXIS) public class ForwardsRealMovementAxis extends BindAxisEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java index a10c6664171..d84cf09fd34 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/JumpButton.java @@ -10,8 +10,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "jump", description = "${engine:menu#binding-jump}", repeating = true) @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.SPACE) @DefaultBinding(type = InputType.CONTROLLER_BUTTON, id = ControllerId.TWO) diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java index a7d64705cf7..c88adfd7819 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/LeftStrafeButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "left", description = "${engine:menu#binding-left}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.A) public class LeftStrafeButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java index 8d05c6f3072..8b204616274 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/RightStrafeButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "right", description = "${engine:menu#binding-right}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.D) public class RightStrafeButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java index af649fee12d..09c90760f06 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeMovementAxis.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.RegisterBindAxis; import org.terasology.engine.input.SendEventMode; -/** - */ @RegisterBindAxis(id = "strafe", positiveButton = "engine:left", negativeButton = "engine:right", eventMode = SendEventMode.WHEN_CHANGED) public class StrafeMovementAxis extends BindAxisEvent { } diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java index 258715aa808..ccfcd161711 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/StrafeRealMovementAxis.java @@ -10,8 +10,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterRealBindAxis(id = "strafeRealMovement", eventMode = SendEventMode.WHEN_CHANGED) @DefaultBinding(type = InputType.CONTROLLER_AXIS, id = ControllerId.X_AXIS) public class StrafeRealMovementAxis extends BindAxisEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java index 25612581840..633414f55ff 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedPermanentlyButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "toggleSpeedPermanently", description = "${engine:menu#binding-toggle-speed-permanently}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.CAPS_LOCK) public class ToggleSpeedPermanentlyButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java index d6636419d2e..d47bfd2d7a0 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/ToggleSpeedTemporarilyButton.java @@ -9,8 +9,6 @@ import org.terasology.input.InputType; import org.terasology.input.Keyboard; -/** - */ @RegisterBindButton(id = "toggleSpeedTemporarily", description = "${engine:menu#binding-toggle-speed-temporarily}") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.LEFT_SHIFT) public class ToggleSpeedTemporarilyButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java index c17d1f30d73..54c89586e28 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalMovementAxis.java @@ -7,8 +7,6 @@ import org.terasology.engine.input.RegisterBindAxis; import org.terasology.engine.input.SendEventMode; -/** - */ @RegisterBindAxis(id = "verticalMovement", positiveButton = "engine:jump", negativeButton = "engine:crouch", eventMode = SendEventMode.WHEN_CHANGED) public class VerticalMovementAxis extends BindAxisEvent { } diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java index 1d456a7629a..931feef8da5 100644 --- a/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java +++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/VerticalRealMovementAxis.java @@ -10,8 +10,6 @@ import org.terasology.input.ControllerId; import org.terasology.input.InputType; -/** - */ @RegisterRealBindAxis(id = "verticalRealMovement", eventMode = SendEventMode.WHEN_CHANGED) @DefaultBinding(type = InputType.CONTROLLER_AXIS, id = ControllerId.Z_AXIS) public class VerticalRealMovementAxis extends BindAxisEvent { diff --git a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java index 7401b7c3b69..7b39d9c3b8a 100644 --- a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetChangedEvent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class CameraTargetChangedEvent implements Event { private EntityRef oldTarget; private EntityRef newTarget; diff --git a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java index 627ac56ba75..c9a9aa1d334 100644 --- a/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java +++ b/engine/src/main/java/org/terasology/engine/input/cameraTarget/CameraTargetSystem.java @@ -23,8 +23,6 @@ import java.util.Arrays; -/** - */ public class CameraTargetSystem extends BaseComponentSystem { @In diff --git a/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java b/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java index 3caa8c46168..a05063aa41d 100644 --- a/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/events/AxisEvent.java @@ -4,8 +4,6 @@ package org.terasology.engine.input.events; -/** - */ public abstract class AxisEvent extends InputEvent { public AxisEvent(float delta) { diff --git a/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java b/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java index 137f611b893..f634c99ee53 100644 --- a/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/events/ButtonEvent.java @@ -5,8 +5,6 @@ import org.terasology.input.ButtonState; -/** - */ public abstract class ButtonEvent extends InputEvent { public ButtonEvent(float delta) { diff --git a/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java b/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java index ef3665f0e6a..5038da532d0 100644 --- a/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java +++ b/engine/src/main/java/org/terasology/engine/input/events/MouseWheelEvent.java @@ -6,8 +6,6 @@ import org.joml.Vector2i; -/** - */ public class MouseWheelEvent extends InputEvent { private int wheelTurns; diff --git a/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java b/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java index 9c1036d7c63..bcdef3758e5 100644 --- a/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java +++ b/engine/src/main/java/org/terasology/engine/input/internal/BindCommands.java @@ -18,8 +18,6 @@ import java.util.HashMap; import java.util.Map; -/** - */ @RegisterSystem public class BindCommands extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java b/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java index 7f3c331ae4a..cef29465859 100644 --- a/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java +++ b/engine/src/main/java/org/terasology/engine/logic/actions/ActionTarget.java @@ -3,8 +3,6 @@ package org.terasology.engine.logic.actions; -/** - */ public enum ActionTarget { Instigator, Target, diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java index cd3f9581163..ec089ef7cd2 100644 --- a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java +++ b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabAction.java @@ -13,8 +13,6 @@ import org.terasology.engine.logic.common.ActivateEvent; import org.terasology.engine.registry.In; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class SpawnPrefabAction extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java index 0db63be15f3..98103cac1d4 100644 --- a/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/actions/SpawnPrefabActionComponent.java @@ -5,8 +5,6 @@ import org.terasology.engine.entitySystem.Component; -/** - */ public class SpawnPrefabActionComponent implements Component { public String prefab; public ActionTarget spawnLocationRelativeTo = ActionTarget.Target; diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java b/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java index 886318dbec9..66c2f7a128d 100644 --- a/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/ai/HierarchicalAIComponent.java @@ -5,8 +5,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; -/** - */ public final class HierarchicalAIComponent implements Component { //how often updates are progressed, handle whit care diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java index 8ece04e188d..3bd81b16347 100644 --- a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAIComponent.java @@ -5,8 +5,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; -/** - */ public final class SimpleAIComponent implements Component { public long lastChangeOfDirectionAt; diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java index e2865520fe4..01cfe3aa9df 100644 --- a/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/ai/SimpleAISystem.java @@ -22,8 +22,6 @@ import org.terasology.engine.utilities.random.Random; import org.terasology.engine.world.WorldProvider; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class SimpleAISystem extends BaseComponentSystem implements UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java b/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java index 407b1e6369c..288082d44e7 100644 --- a/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateSystem.java @@ -15,8 +15,6 @@ import java.util.Set; -/** - */ @RegisterSystem public class AutoCreateSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java index 160c47d361a..cec41174d25 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java @@ -11,7 +11,7 @@ * */ @API -public class CollectiveBehaviorComponent implements Component{ +public class CollectiveBehaviorComponent implements Component { public BehaviorTree tree; public transient CollectiveInterpreter collectiveInterpreter; } diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java index e72d6e1468c..05a25650e2e 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java @@ -28,7 +28,7 @@ public void construct(Actor actor) { public BehaviorState modify(Actor actor, BehaviorState result) { float timeRemaining = 0; - try {// TODO figure out the delegation issue + try { // TODO figure out the delegation issue timeRemaining = actor.getValue(getId()); } catch (NullPointerException e) { construct(actor); diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java index 8ecf960f86c..fade4275f95 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTreeData.java @@ -5,8 +5,6 @@ import org.terasology.gestalt.assets.AssetData; import org.terasology.engine.logic.behavior.core.BehaviorNode; -/** - */ public class BehaviorTreeData implements AssetData { private BehaviorNode root; diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java index 5746b8d2ec8..c8a88b09655 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BTEditorButton.java @@ -8,8 +8,6 @@ import org.terasology.input.Keyboard; import org.terasology.engine.input.RegisterBindButton; -/** - */ @RegisterBindButton(id = "behavior_editor", description = "${engine:menu#binding-behavior-editor}", category = "behavior") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.F5) public class BTEditorButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java index 8c033759326..427ae5e3b33 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorEditorScreen.java @@ -35,8 +35,6 @@ import java.awt.datatransfer.StringSelection; import java.util.List; -/** - */ public class BehaviorEditorScreen extends CoreScreenLayer { public static final Logger logger = LoggerFactory.getLogger(BehaviorEditorScreen.class); public static final String PALETTE_ITEM_OPEN = "--"; diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java index e29b5c7260d..78f10562377 100644 --- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java +++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/PortList.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.stream.Collectors; -/** - */ public class PortList implements TreeAccessor { private List ports = Lists.newLinkedList(); private Port.InputPort inputPort; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java index 0b8ed01cbff..03433649e63 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterMoveInputEvent.java @@ -8,8 +8,6 @@ import org.terasology.engine.network.NetworkEvent; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent public class CharacterMoveInputEvent extends NetworkEvent { private long delta; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java index 16b72e4632d..543c6e97150 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundComponent.java @@ -9,8 +9,6 @@ import java.util.List; -/** - */ public final class CharacterSoundComponent implements Component { public List footstepSounds = Lists.newArrayList(); diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java index b3b64f2943b..68ce0a95602 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSoundSystem.java @@ -32,8 +32,6 @@ import java.util.List; -/** - */ @RegisterSystem(RegisterMode.ALWAYS) public class CharacterSoundSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java index 396c1e20500..5cc5cc7ed72 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java @@ -53,9 +53,7 @@ import java.util.Optional; -/** - * - */ + @RegisterSystem public class CharacterSystem extends BaseComponentSystem implements UpdateSubscriberSystem { public static final CollisionGroup[] DEFAULTPHYSICSFILTER = {StandardCollisionGroup.DEFAULT, StandardCollisionGroup.WORLD, StandardCollisionGroup.CHARACTER}; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java index 083d1f6a24d..1f9c27bc09e 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/ClientCharacterPredictionSystem.java @@ -30,8 +30,6 @@ import java.util.Iterator; import java.util.Map; -/** - */ @RegisterSystem(RegisterMode.REMOTE_CLIENT) public class ClientCharacterPredictionSystem extends BaseComponentSystem implements UpdateSubscriberSystem { private static final Logger logger = LoggerFactory.getLogger(ClientCharacterPredictionSystem.class); @@ -127,7 +125,9 @@ public void onPlayerInput(CharacterMoveInputEvent input, EntityRef entity) { private CharacterStateEvent createInitialState(EntityRef entity) { LocationComponent location = entity.getComponent(LocationComponent.class); - return new CharacterStateEvent(time.getGameTimeInMs(), 0, location.getWorldPosition(new org.joml.Vector3f()), location.getWorldRotation(new Quaternionf()), new Vector3f(), 0, 0, MovementMode.WALKING, false); + return new CharacterStateEvent(time.getGameTimeInMs(), 0, + location.getWorldPosition(new Vector3f()), location.getWorldRotation(new Quaternionf()), + new Vector3f(), 0, 0, MovementMode.WALKING, false); } private CharacterStateEvent stepState(CharacterMoveInputEvent input, CharacterStateEvent lastState, EntityRef entity) { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java b/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java index ba4e3c694bc..a60a44ff8d2 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/MovementMode.java @@ -3,8 +3,6 @@ package org.terasology.engine.logic.characters; -/** - */ public enum MovementMode { WALKING(1f, 8f, true, true, true, 3f, false), CROUCHING(1f, 8f, true, true, true, 1.5f, false), diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java index b659a130258..e54c13a092e 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/VisualCharacterSystem.java @@ -4,7 +4,6 @@ import org.joml.Quaternionf; import org.joml.Vector3f; -import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.engine.core.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent; import org.terasology.engine.entitySystem.entity.EntityBuilder; import org.terasology.engine.entitySystem.entity.EntityManager; @@ -22,6 +21,7 @@ import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.logic.players.LocalPlayer; import org.terasology.engine.registry.In; +import org.terasology.gestalt.assets.management.AssetManager; /** * This system is responsible for sending a {@link CreateVisualCharacterEvent} according to how it is specified in @@ -63,7 +63,8 @@ public void onBeforeDeactivatedVisualCharacter(BeforeDeactivateComponent event, visualCharacterComponent.visualCharacter.destroy(); } - void createVisualCharacterIfNotOwnCharacter(EntityRef characterEntity, VisualCharacterComponent visualCharacterComponent) { + void createVisualCharacterIfNotOwnCharacter(EntityRef characterEntity, + VisualCharacterComponent visualCharacterComponent) { boolean isCharacterOfLocalPlayer = characterEntity.getOwner().equals(localPlayer.getClientEntity()); if (isCharacterOfLocalPlayer) { return; @@ -72,7 +73,7 @@ void createVisualCharacterIfNotOwnCharacter(EntityRef characterEntity, VisualCha characterEntity.send(event); EntityBuilder entityBuilder = event.getVisualCharacterBuilder(); EntityRef visualCharacterEntity = createAndAttachVisualEntityStrategy.createAndAttachVisualEntity(entityBuilder, - characterEntity); + characterEntity); visualCharacterComponent.visualCharacter = visualCharacterEntity; characterEntity.saveComponent(visualCharacterComponent); diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java index 9ec0d3ae973..781d9f26cfd 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationPredicted.java @@ -7,8 +7,6 @@ import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; import org.terasology.engine.logic.location.LocationComponent; -/** - */ public class ActivationPredicted extends AbstractConsumableEvent { private EntityRef instigator; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java index 4e8b9eb18c6..19b554f1330 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/ActivationRequest.java @@ -8,8 +8,6 @@ import org.terasology.engine.network.NetworkEvent; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent(lagCompensate = true) public class ActivationRequest extends NetworkEvent { /** diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java index 8c6c37af75c..394a986d195 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/AttackRequest.java @@ -7,8 +7,6 @@ import org.terasology.engine.network.NetworkEvent; import org.terasology.engine.network.ServerEvent; -/** - */ @ServerEvent(lagCompensate = true) public class AttackRequest extends NetworkEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java index 0d50306f273..6d7d6f24e21 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/CollisionEvent.java @@ -5,8 +5,6 @@ import org.joml.Vector3f; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class CollisionEvent implements Event { private Vector3f velocity; private Vector3f location; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java index 377df20b839..8e8836ba1a8 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/FootstepEvent.java @@ -4,8 +4,6 @@ import org.terasology.engine.entitySystem.event.Event; -/** - */ public class FootstepEvent implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java index e06b25d1765..aac8642f285 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/HorizontalCollisionEvent.java @@ -4,8 +4,6 @@ import org.joml.Vector3f; -/** - */ public class HorizontalCollisionEvent extends CollisionEvent { public HorizontalCollisionEvent(Vector3f location, Vector3f velocity) { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java index e1035435284..f594b3244d2 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/JumpEvent.java @@ -4,7 +4,5 @@ import org.terasology.engine.entitySystem.event.Event; -/** - */ public class JumpEvent implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java index c86fb1168bb..b4b1265ece7 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/SetMovementModeEvent.java @@ -5,8 +5,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.logic.characters.MovementMode; -/** - */ public class SetMovementModeEvent implements Event { private MovementMode mode; diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java index 0e367149ea5..c8a67d0717a 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/VerticalCollisionEvent.java @@ -4,8 +4,6 @@ import org.joml.Vector3f; -/** - */ public class VerticalCollisionEvent extends CollisionEvent { public VerticalCollisionEvent(Vector3f location, Vector3f velocity) { diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java index 0f748cc18ee..bb996f804ad 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionSystem.java @@ -19,8 +19,6 @@ import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.ScreenLayerClosedEvent; -/** - */ @RegisterSystem(RegisterMode.ALWAYS) public class InteractionSystem extends BaseComponentSystem { private static final Logger logger = LoggerFactory.getLogger(InteractionSystem.class); diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java index 44b14e4029f..70b8d64e901 100644 --- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionTargetComponent.java @@ -4,7 +4,5 @@ import org.terasology.engine.entitySystem.Component; -/** - */ public class InteractionTargetComponent implements Component { } diff --git a/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java b/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java index 607a3120313..73d1b4aa5a8 100644 --- a/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/chat/ChatSystem.java @@ -33,8 +33,6 @@ import static java.util.stream.Collectors.joining; -/** - */ @RegisterSystem public class ChatSystem extends BaseComponentSystem { private static final Logger logger = LoggerFactory.getLogger(ChatSystem.class); diff --git a/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java b/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java index e5e56c43947..d68310b72f7 100644 --- a/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/common/ActivateEvent.java @@ -8,8 +8,6 @@ import org.terasology.engine.logic.characters.events.ActivationRequest; import org.terasology.engine.logic.location.LocationComponent; -/** - */ // TODO: This should not be consumable. Instead have a consumable BeforeActivate event to allow cancellation public class ActivateEvent extends AbstractConsumableEvent { private EntityRef instigator; diff --git a/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java b/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java index 90d790e801f..af2ac9e9de6 100644 --- a/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java +++ b/engine/src/main/java/org/terasology/engine/logic/common/DisplayNameComponent.java @@ -7,8 +7,6 @@ import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.items.AddToBlockBasedItem; -/** - */ @AddToBlockBasedItem public class DisplayNameComponent implements Component { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java b/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java index c3084f6924f..0ab4f61d5b1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/common/lifespan/LifespanSystem.java @@ -14,8 +14,6 @@ import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.registry.In; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class LifespanSystem extends BaseComponentSystem implements UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/Console.java b/engine/src/main/java/org/terasology/engine/logic/console/Console.java index ed908ef0d11..207cc141224 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/Console.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/Console.java @@ -9,8 +9,6 @@ import java.util.Collection; import java.util.List; -/** - */ public interface Console { String NEW_LINE = "\n"; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java b/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java index 2e72e54e7d5..4597eb31fd7 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/CoreMessageType.java @@ -5,8 +5,6 @@ import org.terasology.nui.Color; -/** - */ public enum CoreMessageType implements MessageType { CONSOLE(ConsoleColors.DEFAULT), CHAT(ConsoleColors.CHAT), diff --git a/engine/src/main/java/org/terasology/engine/logic/console/Message.java b/engine/src/main/java/org/terasology/engine/logic/console/Message.java index 13cfa02a9f2..9d5164ae0e1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/Message.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/Message.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console; -/** - */ public class Message { private final MessageType type; @@ -42,8 +40,7 @@ public MessageType getType() { return type; } - public boolean hasNewLine() - { + public boolean hasNewLine() { return newLine; } diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java index 3ce9d43665f..700b86ed19a 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameter.java @@ -17,8 +17,6 @@ import java.util.Optional; import java.util.Set; -/** - */ public final class CommandParameter implements Parameter { private final String name; private final Class type; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java index 7c7cec166bf..15bdef6bb38 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MarkerParameters.java @@ -6,8 +6,6 @@ import java.util.Optional; -/** - */ public enum MarkerParameters implements Parameter { /** * Marks a parameter which is invalid - there is no information on how it should be provided. diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java index 3a22ecb9eb7..235a8f4f1a2 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/MethodCommand.java @@ -10,13 +10,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.engine.context.Context; +import org.terasology.engine.logic.console.Console; import org.terasology.engine.logic.console.commandSystem.annotations.Command; import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam; import org.terasology.engine.logic.console.commandSystem.annotations.Sender; -import org.terasology.engine.logic.console.Console; -import org.terasology.gestalt.naming.Name; import org.terasology.engine.registry.InjectionHelper; import org.terasology.engine.utilities.reflection.SpecificAccessibleObject; +import org.terasology.gestalt.naming.Name; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -24,20 +24,18 @@ import java.util.List; import java.util.Set; -/** - */ public final class MethodCommand extends AbstractCommand { private static final Logger logger = LoggerFactory.getLogger(MethodCommand.class); private static final String ENTITY_REF_NAME = "org.terasology.engine.entitySystem.entity.EntityRef"; - private MethodCommand(Name name, String requiredPermission, boolean runOnServer, String description, String helpText, + private MethodCommand(Name name, String requiredPermission, boolean runOnServer, String description, + String helpText, SpecificAccessibleObject executionMethod, Context context) { super(name, requiredPermission, runOnServer, description, helpText, executionMethod, context); } /** - * Creates a new {@code ReferencedCommand} to a specific method - * annotated with {@link Command}. + * Creates a new {@code ReferencedCommand} to a specific method annotated with {@link Command}. * * @param specificMethod The method to reference to * @return The command reference object created @@ -71,20 +69,25 @@ public static MethodCommand referringTo(SpecificAccessibleObject specifi * Registers all available command methods annotated with {@link Command}. */ public static void registerAvailable(Object provider, Console console, Context context) { - Predicate predicate = Predicates.and(ReflectionUtils.withModifier(Modifier.PUBLIC), ReflectionUtils.withAnnotation(Command.class)); + Predicate predicate = Predicates.and(ReflectionUtils.withModifier(Modifier.PUBLIC), + ReflectionUtils.withAnnotation(Command.class)); Set commandMethods = ReflectionUtils.getAllMethods(provider.getClass(), predicate); for (Method method : commandMethods) { if (!hasSenderAnnotation(method)) { - logger.error("Command {} provided by {} contains a EntityRef without @Sender annotation, may cause a NullPointerException", method.getName(), provider.getClass().getSimpleName()); + logger.error("Command {} provided by {} contains a EntityRef without @Sender annotation, may cause a " + + "NullPointerException", method.getName(), provider.getClass().getSimpleName()); } - logger.debug("Registering command method {} in class {}", method.getName(), method.getDeclaringClass().getCanonicalName()); + logger.debug("Registering command method {} in class {}", method.getName(), + method.getDeclaringClass().getCanonicalName()); try { SpecificAccessibleObject specificMethod = new SpecificAccessibleObject<>(method, provider); MethodCommand command = referringTo(specificMethod, context); console.registerCommand(command); - logger.debug("Registered command method {} in class {}", method.getName(), method.getDeclaringClass().getCanonicalName()); + logger.debug("Registered command method {} in class {}", method.getName(), + method.getDeclaringClass().getCanonicalName()); } catch (RuntimeException t) { - logger.error("Failed to load command method {} in class {}", method.getName(), method.getDeclaringClass().getCanonicalName(), t); + logger.error("Failed to load command method {} in class {}", method.getName(), + method.getDeclaringClass().getCanonicalName(), t); } } } @@ -97,7 +100,7 @@ private static boolean hasSenderAnnotation(Method method) { if (paramAnnotations[i].length == 0) { return false; } else { - for (Annotation annotation: paramAnnotations[i]) { + for (Annotation annotation : paramAnnotations[i]) { if (annotation instanceof Sender) { return true; } @@ -133,7 +136,7 @@ private static Parameter getParameterTypeFor(Class type, Annotation[] annotat String name = parameterAnnotation.value(); Class suggesterClass = parameterAnnotation.suggester(); boolean required = parameterAnnotation.required(); - CommandParameterSuggester suggester = InjectionHelper.createWithConstructorInjection(suggesterClass, + CommandParameterSuggester suggester = InjectionHelper.createWithConstructorInjection(suggesterClass, context); if (type.isArray()) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java index df8426fb0ea..9214cdac8d0 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/BlockFamilyAdapter.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.block.family.BlockFamily; -/** - */ public class BlockFamilyAdapter implements ParameterAdapter { @Override public BlockFamily parse(String raw) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java index ef5d6dd7cbd..21e5ae0eace 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/NameAdapter.java @@ -4,8 +4,6 @@ import org.terasology.gestalt.naming.Name; -/** - */ public class NameAdapter implements ParameterAdapter { @Override public Name parse(String raw) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java index 6bd383e5abc..a01919f3288 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java @@ -11,8 +11,6 @@ import java.util.Map; -/** - */ @API public class ParameterAdapterManager { private final Map, ParameterAdapter> adapters = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java index f0d1d34b850..e30a706d9e8 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrefabAdapter.java @@ -5,8 +5,6 @@ import org.terasology.engine.utilities.Assets; import org.terasology.engine.entitySystem.prefab.Prefab; -/** - */ public class PrefabAdapter implements ParameterAdapter { @Override public Prefab parse(String raw) { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java index b147894cc01..86ee7a9d9dc 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/PrimitiveAdapters.java @@ -5,8 +5,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -/** - */ public final class PrimitiveAdapters { public static final ParameterAdapter LONG = new ParameterAdapter() { diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java index df2ef70ee99..62a1e6af528 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandExecutionException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.commandSystem.exceptions; -/** - */ public class CommandExecutionException extends Exception { private static final long serialVersionUID = 5104187084941740072L; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java index d3f51bb02f9..d43ff45fce9 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandInitializationException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.commandSystem.exceptions; -/** - */ public class CommandInitializationException extends IllegalArgumentException { private static final long serialVersionUID = 5345663512766407880L; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java index afee185d5e4..c4079a2f0de 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/exceptions/CommandParameterParseException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.commandSystem.exceptions; -/** - */ public class CommandParameterParseException extends Exception { private static final long serialVersionUID = 4519046979318192019L; private final String parameter; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java b/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java index 658f803954d..f80cbcdc1b7 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/suggesters/CommandNameSuggester.java @@ -12,8 +12,6 @@ import java.util.Collection; import java.util.Set; -/** - */ public final class CommandNameSuggester implements CommandParameterSuggester { private final Console console; diff --git a/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java b/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java index 2dea13091c6..9cf5f6529d6 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/ui/TabCompletionEngine.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.logic.console.ui; -/** - */ public interface TabCompletionEngine { /** diff --git a/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java b/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java index 62d4ec0142a..6a5a8977a34 100644 --- a/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java +++ b/engine/src/main/java/org/terasology/engine/logic/console/ui/UICommandEntry.java @@ -11,8 +11,6 @@ import java.util.List; -/** - */ public class UICommandEntry extends UIText { private Binding> commandHistory = new DefaultBinding<>(Lists.newArrayList()); diff --git a/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java b/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java index 404d4356347..64b4250f0bf 100644 --- a/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java +++ b/engine/src/main/java/org/terasology/engine/logic/debug/ChunkEventErrorLogger.java @@ -16,8 +16,6 @@ import java.util.Set; -/** - */ @RegisterSystem public class ChunkEventErrorLogger extends BaseComponentSystem { private static final Logger logger = LoggerFactory.getLogger(ChunkEventErrorLogger.class); diff --git a/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java b/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java index 8eee7a8d7d0..4112e3b45b9 100644 --- a/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/delay/DelayedActionTriggeredEvent.java @@ -4,8 +4,6 @@ import org.terasology.engine.entitySystem.event.Event; -/** - */ public class DelayedActionTriggeredEvent implements Event { private String actionId; diff --git a/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java b/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java index 13ed31c54df..261efc26b3b 100644 --- a/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/delay/PeriodicActionTriggeredEvent.java @@ -4,8 +4,6 @@ import org.terasology.engine.entitySystem.event.Event; -/** - */ public class PeriodicActionTriggeredEvent implements Event { private String actionId; diff --git a/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java b/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java index 581c4bb49f8..7f0854ee65d 100644 --- a/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java +++ b/engine/src/main/java/org/terasology/engine/logic/health/BeforeDestroyEvent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.event.AbstractConsumableEvent; import org.terasology.engine.entitySystem.prefab.Prefab; -/** - */ public class BeforeDestroyEvent extends AbstractConsumableEvent { private EntityRef instigator; private EntityRef directCause; diff --git a/engine/src/main/java/org/terasology/engine/logic/location/Location.java b/engine/src/main/java/org/terasology/engine/logic/location/Location.java index ffc8c2b4f95..9513616acdc 100644 --- a/engine/src/main/java/org/terasology/engine/logic/location/Location.java +++ b/engine/src/main/java/org/terasology/engine/logic/location/Location.java @@ -15,8 +15,6 @@ import java.util.Iterator; -/** - */ @RegisterSystem public class Location extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java index 7a9846f40dd..814ca75da28 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/DebugControlSystem.java @@ -10,18 +10,18 @@ import org.terasology.engine.entitySystem.systems.BaseComponentSystem; import org.terasology.engine.entitySystem.systems.RegisterMode; import org.terasology.engine.entitySystem.systems.RegisterSystem; -import org.terasology.engine.logic.characters.CharacterComponent; -import org.terasology.engine.logic.players.event.WorldtimeResetEvent; -import org.terasology.input.Keyboard; import org.terasology.engine.input.binds.general.HideHUDButton; import org.terasology.engine.input.events.KeyDownEvent; import org.terasology.engine.input.events.KeyEvent; import org.terasology.engine.input.events.MouseAxisEvent; +import org.terasology.engine.logic.characters.CharacterComponent; +import org.terasology.engine.logic.players.event.WorldtimeResetEvent; import org.terasology.engine.network.ClientComponent; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.NUIManager; import org.terasology.engine.rendering.nui.layers.ingame.metrics.DebugOverlay; import org.terasology.engine.world.WorldProvider; +import org.terasology.input.Keyboard; @RegisterSystem(RegisterMode.CLIENT) @@ -50,7 +50,8 @@ public void initialise() { public void onHideHUD(HideHUDButton event, EntityRef entity) { if (event.isDown()) { // Make sure both are either visible or hidden - final boolean hide = !(config.getRendering().getDebug().isHudHidden() && config.getRendering().getDebug().isFirstPersonElementsHidden()); + final boolean hide = + !(config.getRendering().getDebug().isHudHidden() && config.getRendering().getDebug().isFirstPersonElementsHidden()); config.getRendering().getDebug().setFirstPersonElementsHidden(hide); config.getRendering().getDebug().setHudHidden(hide); @@ -61,9 +62,9 @@ public void onHideHUD(HideHUDButton event, EntityRef entity) { /** - * Creates illusion of time flying by if corresponding key is held down. - * Up / Down : Increases / Decreases time of day by 0.005 per keystroke. - * Right / left : Increases / Decreases time of day by 0.02 per keystroke. + * Creates illusion of time flying by if corresponding key is held down. Up / Down : Increases / Decreases time of + * day by 0.005 per keystroke. Right / left : Increases / Decreases time of day by 0.02 per keystroke. + * * @param entity The player entity that triggered the time change. */ @ReceiveEvent(components = ClientComponent.class) @@ -79,7 +80,7 @@ public void onKeyEvent(KeyEvent event, EntityRef entity) { timeTravel(entity, event, -0.005f); break; case Keyboard.KeyId.RIGHT: - timeTravel(entity, event, 0.02f); + timeTravel(entity, event, 0.02f); break; case Keyboard.KeyId.LEFT: timeTravel(entity, event, -0.02f); @@ -140,15 +141,15 @@ public void onMouseX(MouseAxisEvent event, EntityRef entity) { } /** - * Ensures every player on the server has their time updated when - * a KeyEvent is triggered in Debug mode. + * Ensures every player on the server has their time updated when a KeyEvent is triggered in Debug mode. + * * @param entity The player entity that triggered the time change. * @param event The KeyEvent which triggered the time change. * @param timeDiff The time (in days) to add/retrieve. */ private void timeTravel(EntityRef entity, KeyEvent event, float timeDiff) { - float timeInDays = world.getTime().getDays(); - entity.send(new WorldtimeResetEvent(timeInDays + timeDiff)); + float timeInDays = world.getTime().getDays(); + entity.send(new WorldtimeResetEvent(timeInDays + timeDiff)); event.consume(); } diff --git a/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java b/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java index 2d35b57621b..6e22113e319 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/DecreaseViewDistanceButton.java @@ -9,8 +9,6 @@ import org.terasology.input.Keyboard; import org.terasology.engine.input.RegisterBindButton; -/** - */ @RegisterBindButton(id = "decreaseViewDistance", description = "${engine:menu#binding-decrease-view-distance}", mode = ActivateMode.PRESS, category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.END) public class DecreaseViewDistanceButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java b/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java index 0715864c4e0..a8f397eda5b 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/IncreaseViewDistanceButton.java @@ -9,8 +9,6 @@ import org.terasology.input.Keyboard; import org.terasology.engine.input.RegisterBindButton; -/** - */ @RegisterBindButton(id = "increaseViewDistance", description = "${engine:menu#binding-increase-view-distance}", mode = ActivateMode.PRESS, category = "general") @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.HOME) public class IncreaseViewDistanceButton extends BindButtonEvent { diff --git a/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java index 99b0bba397b..d0a073125c1 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java @@ -138,23 +138,25 @@ public void update(float delta) { if (localPlayerInitialized) { EntityRef entity = localPlayer.getCharacterEntity(); - CharacterMovementComponent characterMovementComponent = entity.getComponent(CharacterMovementComponent.class); + CharacterMovementComponent characterMovementComponent = + entity.getComponent(CharacterMovementComponent.class); processInput(entity, characterMovementComponent); - updateCamera(characterMovementComponent, localPlayer.getViewPosition(new Vector3f()), localPlayer.getViewRotation(new Quaternionf())); + updateCamera(characterMovementComponent, localPlayer.getViewPosition(new Vector3f()), + localPlayer.getViewRotation(new Quaternionf())); } } private void processInput(EntityRef entity, CharacterMovementComponent characterMovementComponent) { lookYaw = (float) ((lookYaw - lookYawDelta) % 360); lookYawDelta = 0f; - lookPitch = (float) Math.clamp(-89, 89,lookPitch + lookPitchDelta); + lookPitch = (float) Math.clamp(-89, 89, lookPitch + lookPitchDelta); lookPitchDelta = 0f; Vector3f relMove = new Vector3f(relativeMovement); relMove.y = 0; - Quaternionf viewRotation = new Quaternionf(); + Quaternionf viewRotation = new Quaternionf(); switch (characterMovementComponent.mode) { case CROUCHING: case WALKING: @@ -177,9 +179,11 @@ private void processInput(EntityRef entity, CharacterMovementComponent character relMove.y += relativeMovement.y; break; } - // For some reason, Quat4f.rotate is returning NaN for valid inputs. This prevents those NaNs from causing trouble down the line. + // For some reason, Quat4f.rotate is returning NaN for valid inputs. This prevents those NaNs from causing + // trouble down the line. if (relMove.isFinite()) { - entity.send(new CharacterMoveInputEvent(inputSequenceNumber++, lookPitch, lookYaw, relMove, run, crouch, jump, time.getGameDeltaInMs())); + entity.send(new CharacterMoveInputEvent(inputSequenceNumber++, lookPitch, lookYaw, relMove, run, crouch, + jump, time.getGameDeltaInMs())); } jump = false; } @@ -195,8 +199,8 @@ private Input getValidKey(List inputs) { } /** - * Auto move is disabled when the associated key is pressed again. - * This cancels the simulated repeated key stroke for the forward input button. + * Auto move is disabled when the associated key is pressed again. This cancels the simulated repeated key stroke + * for the forward input button. */ private void stopAutoMove() { List inputs = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:forwards")); @@ -209,8 +213,8 @@ private void stopAutoMove() { } /** - * Append the input for moving forward to the keyboard command queue to simulate pressing of the forward key. - * For an input that repeats, the key must be in Down state before Repeat state can be applied to it. + * Append the input for moving forward to the keyboard command queue to simulate pressing of the forward key. For an + * input that repeats, the key must be in Down state before Repeat state can be applied to it. */ private void startAutoMove() { isAutoMove = false; @@ -284,7 +288,7 @@ public void updateForwardsMovement(ForwardsMovementAxis event, EntityRef entity) @ReceiveEvent(components = {ClientComponent.class}) public void updateStrafeMovement(StrafeMovementAxis event, EntityRef entity) { - relativeMovement.x = (float)event.getValue(); + relativeMovement.x = (float) event.getValue(); event.consume(); } @@ -296,7 +300,7 @@ public void updateVerticalMovement(VerticalMovementAxis event, EntityRef entity) @ReceiveEvent(components = {ClientComponent.class}) public void updateForwardsMovement(ForwardsRealMovementAxis event, EntityRef entity) { - relativeMovement.z = (float)event.getValue(); + relativeMovement.z = (float) event.getValue(); event.consume(); } @@ -308,7 +312,7 @@ public void updateStrafeMovement(StrafeRealMovementAxis event, EntityRef entity) @ReceiveEvent(components = {ClientComponent.class}) public void updateVerticalMovement(VerticalRealMovementAxis event, EntityRef entity) { - relativeMovement.y = (float)event.getValue(); + relativeMovement.y = (float) event.getValue(); event.consume(); } @@ -444,7 +448,8 @@ public void onFrobButton(FrobButton event, EntityRef character) { } @ReceiveEvent(components = {CharacterComponent.class}) - public void onUseItemButton(UseItemButton event, EntityRef entity, CharacterHeldItemComponent characterHeldItemComponent) { + public void onUseItemButton(UseItemButton event, EntityRef entity, + CharacterHeldItemComponent characterHeldItemComponent) { if (!event.isDown()) { return; } @@ -490,8 +495,8 @@ public void renderShadows() { } /** - * Special getter that fetches the client entity via the NetworkSystem instead of the LocalPlayer. - * This can be needed in special cases where the local player isn't fully available (TODO: May be a bug?) + * Special getter that fetches the client entity via the NetworkSystem instead of the LocalPlayer. This can be + * needed in special cases where the local player isn't fully available (TODO: May be a bug?) * * @return the EntityRef that the networking system says is the client associated with this player */ diff --git a/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java b/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java index 3b82cc3df5d..a083030f0f4 100644 --- a/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java +++ b/engine/src/main/java/org/terasology/engine/logic/players/ThirdPersonRemoteClientSystem.java @@ -21,11 +21,11 @@ import org.terasology.engine.entitySystem.systems.RegisterSystem; import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.logic.characters.CharacterComponent; -import org.terasology.engine.logic.location.Location; -import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.logic.characters.CharacterHeldItemComponent; import org.terasology.engine.logic.console.commandSystem.annotations.Command; import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam; +import org.terasology.engine.logic.location.Location; +import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.network.ClientComponent; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.logic.VisualComponent; @@ -56,6 +56,7 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement /** * Ensures held item mount point entity exists, attaches it to the character and sets its transform. + * * @param event the activation that triggered the need to consider changing a held item * @param character the character for which we need to consider the held item * @param remotePersonHeldItemMountPointComponent data for the mount point on the remote character @@ -64,7 +65,8 @@ public class ThirdPersonRemoteClientSystem extends BaseComponentSystem implement public void ensureClientSideEntityOnHeldItemMountPoint(OnActivatedComponent event, EntityRef character, RemotePersonHeldItemMountPointComponent remotePersonHeldItemMountPointComponent) { if (relatesToLocalPlayer(character)) { - logger.debug("ensureClientSideEntityOnHeldItemMountPoint found its given character to relate to the local player, ignoring: {}", character); + logger.debug("ensureClientSideEntityOnHeldItemMountPoint found its given character to relate to the local" + + " player, ignoring: {}", character); return; } @@ -89,15 +91,19 @@ public void ensureClientSideEntityOnHeldItemMountPoint(OnActivatedComponent even } @ReceiveEvent - public void ensureHeldItemIsMountedOnLoad(OnChangedComponent event, EntityRef clientEntity, ClientComponent clientComponent) { + public void ensureHeldItemIsMountedOnLoad(OnChangedComponent event, EntityRef clientEntity, + ClientComponent clientComponent) { if (relatesToLocalPlayer(clientEntity)) { - logger.debug("ensureHeldItemIsMountedOnLoad found its given clientEntity to relate to the local player, ignoring: {}", clientEntity); + logger.debug("ensureHeldItemIsMountedOnLoad found its given clientEntity to relate to the local player, " + + "ignoring: {}", clientEntity); return; } if (clientEntity.exists() && clientComponent.character != EntityRef.NULL) { - logger.debug("ensureHeldItemIsMountedOnLoad says a given clientEntity exists, has a character, and isn't related to the local player: {}", clientEntity); - CharacterHeldItemComponent characterHeldItemComponent = clientComponent.character.getComponent(CharacterHeldItemComponent.class); + logger.debug("ensureHeldItemIsMountedOnLoad says a given clientEntity exists, has a character, and isn't " + + "related to the local player: {}", clientEntity); + CharacterHeldItemComponent characterHeldItemComponent = + clientComponent.character.getComponent(CharacterHeldItemComponent.class); if (characterHeldItemComponent != null && !(clientComponent.character.equals(localPlayer.getCharacterEntity()))) { linkHeldItemLocationForRemotePlayer(characterHeldItemComponent.selectedItem, clientComponent.character); } @@ -107,68 +113,86 @@ public void ensureHeldItemIsMountedOnLoad(OnChangedComponent event, EntityRef cl } @Command(shortDescription = "Sets the held item mount point translation for remote characters") - public void setRemotePlayersHeldItemMountPointTranslations(@CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { + public void setRemotePlayersHeldItemMountPointTranslations(@CommandParam("x") float x, @CommandParam("y") float y + , @CommandParam("z") float z) { for (EntityRef remotePlayer : entityManager.getEntitiesWith(RemotePersonHeldItemMountPointComponent.class)) { - RemotePersonHeldItemMountPointComponent remoteMountPointComponent = remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); + RemotePersonHeldItemMountPointComponent remoteMountPointComponent = + remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); remoteMountPointComponent.translate.set(x, y, z); } } @Command(shortDescription = "Sets the held item mount point rotation for remote characters") - public void setRemotePlayersHeldItemMountPointRotations(@CommandParam("x") float x, @CommandParam("y") float y, @CommandParam("z") float z) { + public void setRemotePlayersHeldItemMountPointRotations(@CommandParam("x") float x, @CommandParam("y") float y, + @CommandParam("z") float z) { for (EntityRef remotePlayer : entityManager.getEntitiesWith(RemotePersonHeldItemMountPointComponent.class)) { - RemotePersonHeldItemMountPointComponent remoteMountPointComponent = remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); + RemotePersonHeldItemMountPointComponent remoteMountPointComponent = + remotePlayer.getComponent(RemotePersonHeldItemMountPointComponent.class); remoteMountPointComponent.rotateDegrees.set(x, y, z); } } @ReceiveEvent - public void onHeldItemActivated(OnActivatedComponent event, EntityRef player, CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { + public void onHeldItemActivated(OnActivatedComponent event, EntityRef player, + CharacterHeldItemComponent heldItemComponent, + CharacterComponent characterComponents) { if (relatesToLocalPlayer(player)) { - logger.debug("onHeldItemActivated found its given player to relate to the local player, ignoring: {}", player); + logger.debug("onHeldItemActivated found its given player to relate to the local player, ignoring: {}", + player); return; } - logger.debug("onHeldItemActivated says the given player is not the local player's character entity: {}", player); + logger.debug("onHeldItemActivated says the given player is not the local player's character entity: {}", + player); EntityRef newItem = heldItemComponent.selectedItem; linkHeldItemLocationForRemotePlayer(newItem, player); } @ReceiveEvent - public void onHeldItemChanged(OnChangedComponent event, EntityRef character, CharacterHeldItemComponent heldItemComponent, CharacterComponent characterComponents) { + public void onHeldItemChanged(OnChangedComponent event, EntityRef character, + CharacterHeldItemComponent heldItemComponent, + CharacterComponent characterComponents) { if (relatesToLocalPlayer(character)) { - logger.debug("onHeldItemChanged found its given character to relate to the local player, ignoring: {}", character); + logger.debug("onHeldItemChanged found its given character to relate to the local player, ignoring: {}", + character); return; } - logger.debug("onHeldItemChanged says the given character is not the local player's character entity: {}", character); + logger.debug("onHeldItemChanged says the given character is not the local player's character entity: {}", + character); EntityRef newItem = heldItemComponent.selectedItem; linkHeldItemLocationForRemotePlayer(newItem, character); } /** * Changes held item entity. - * - * Detaches old held item and removes its components. Adds components to new held item and - * attaches it to the mount point entity. + *

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

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

* The iterating vector is reused. Do not attempt to store the instance e.g. in a collection. */ -public class SpiralIterable implements Iterable{ +public class SpiralIterable implements Iterable { /** * (MAX_SIDELEN * 2 + 1) ^2 must be < Integer.MAX_VALUE diff --git a/engine/src/main/java/org/terasology/engine/monitoring/Activity.java b/engine/src/main/java/org/terasology/engine/monitoring/Activity.java index f68801c2e16..7f883cdc905 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/Activity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/Activity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; /** diff --git a/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java index 8b62a82d21c..c0ff506acfe 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/PerformanceMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; import gnu.trove.map.TObjectDoubleMap; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java b/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java index 00a2c8e8ffb..37111de5274 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/ThreadActivity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; /** diff --git a/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java index 416541847de..7c310e78c26 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/ThreadMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java index 260e72edba5..39c5c39932d 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMeshInfo.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import org.terasology.engine.rendering.primitives.ChunkMesh; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java index e4638f0e1e7..2c37409bda4 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java index 6c3f37dd921..ecffb77a102 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEntry.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import com.google.common.base.Preconditions; @@ -60,7 +47,8 @@ public Chunk getLatestChunk() { public void addChunk(Chunk value) { Preconditions.checkNotNull(value, "The parameter 'value' must not be null"); - Preconditions.checkArgument(pos.equals(value.getPosition(new Vector3i())), "Expected chunk for position {} but got position {} instead", pos, value.getPosition(new Vector3i())); + Preconditions.checkArgument(pos.equals(value.getPosition(new Vector3i())), + "Expected chunk for position {} but got position {} instead", pos, value.getPosition(new Vector3i())); purge(); chunks.add(new WeakReference<>(value)); } diff --git a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java index b9ccb7cf17f..098c074b41a 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/chunk/ChunkMonitorEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.chunk; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java index d1748566975..067287ff49f 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/AdvancedMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import javax.swing.JTabbedPane; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java index fdbea383253..9a907828630 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorDisplayEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java index 2ac301b329c..a21c05e4487 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/ChunkMonitorPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import javax.swing.JPanel; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java index e5c7e2c59e7..48b4d1640fc 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/PerformanceMonitorPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java b/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java index f5903b09e95..3d4a54f4d0e 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/gui/ThreadMonitorPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.gui; import com.google.common.eventbus.Subscribe; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java index 80ef4719fce..ebee57662be 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullActivity.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import org.terasology.engine.monitoring.Activity; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java index 80c43f07495..a59a739156a 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullPerformanceMonitor.java @@ -1,26 +1,11 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import gnu.trove.map.TObjectDoubleMap; import gnu.trove.map.hash.TObjectDoubleHashMap; import org.terasology.engine.monitoring.Activity; -/** - */ public class NullPerformanceMonitor implements PerformanceMonitorInternal { private static final NullActivity NULL_ACTIVITY = new NullActivity(); private TObjectDoubleMap metrics = new TObjectDoubleHashMap<>(); diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java index 908019d5b7a..e6ed6d2f3cf 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/NullThreadActivity.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import org.terasology.engine.monitoring.ThreadActivity; -/** - */ public class NullThreadActivity implements ThreadActivity { @Override public void close() { diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java index 23ea4922578..53433cf9098 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java index c3af7c4f0bf..5d214db8f2d 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/PerformanceMonitorInternal.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import gnu.trove.map.TObjectDoubleMap; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java index 247f0319bdc..6eb4a2cd468 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import java.util.List; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java index d4b48fd48a7..dc7bf310bc1 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/SingleThreadMonitorImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import com.google.common.base.Objects; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java index 445b77610a7..8e6ac159b7d 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadActivityInternal.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; import org.terasology.engine.monitoring.ThreadActivity; -/** - */ public class ThreadActivityInternal implements ThreadActivity { private SingleThreadMonitor monitor; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java index b8a346112a2..90a6403f1b2 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/impl/ThreadMonitorEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.monitoring.impl; diff --git a/engine/src/main/java/org/terasology/engine/monitoring/package-info.java b/engine/src/main/java/org/terasology/engine/monitoring/package-info.java index 6843c0c8232..025146f8b51 100644 --- a/engine/src/main/java/org/terasology/engine/monitoring/package-info.java +++ b/engine/src/main/java/org/terasology/engine/monitoring/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.monitoring; diff --git a/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java b/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java index b664e46d65c..9fe80261d34 100644 --- a/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/BroadcastEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/Client.java b/engine/src/main/java/org/terasology/engine/network/Client.java index 00d3ae1d8e2..c21ddea91f2 100644 --- a/engine/src/main/java/org/terasology/engine/network/Client.java +++ b/engine/src/main/java/org/terasology/engine/network/Client.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ClientComponent.java b/engine/src/main/java/org/terasology/engine/network/ClientComponent.java index 3d0626378eb..315e8ed49fa 100644 --- a/engine/src/main/java/org/terasology/engine/network/ClientComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/ClientComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java b/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java index 4f35adc5b6e..5a67ea38fc7 100644 --- a/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/ClientInfoComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java b/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java index f1365048b56..6a3ebb38830 100644 --- a/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java +++ b/engine/src/main/java/org/terasology/engine/network/ClientPingSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/network/ColorComponent.java b/engine/src/main/java/org/terasology/engine/network/ColorComponent.java index 741bb5c350a..2088d408e5c 100644 --- a/engine/src/main/java/org/terasology/engine/network/ColorComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/ColorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java b/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java index 0d750bf66ee..9e02c1ce2f8 100644 --- a/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java +++ b/engine/src/main/java/org/terasology/engine/network/FieldReplicateType.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; -/** - */ public enum FieldReplicateType { SERVER_TO_CLIENT(false), SERVER_TO_OWNER(false), diff --git a/engine/src/main/java/org/terasology/engine/network/JoinStatus.java b/engine/src/main/java/org/terasology/engine/network/JoinStatus.java index 530acac5fd3..1bbcf66b606 100644 --- a/engine/src/main/java/org/terasology/engine/network/JoinStatus.java +++ b/engine/src/main/java/org/terasology/engine/network/JoinStatus.java @@ -1,22 +1,7 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; -/** - */ public interface JoinStatus { enum Status { diff --git a/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java b/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java index f10aa6f6ffe..28ab69e5b1d 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java +++ b/engine/src/main/java/org/terasology/engine/network/NetMetricSource.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java b/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java index 5cff99417a3..8650db63f7c 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; -/** - */ public class NetworkComponent implements Component { public ReplicateMode replicateMode = ReplicateMode.RELEVANT; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java b/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java index 3cd574ad52d..90cc5de9cc1 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java b/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java index 501334d92f2..3f5d5e68850 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkEventSystemDecorator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkMode.java b/engine/src/main/java/org/terasology/engine/network/NetworkMode.java index 0f061b50c3a..9020f25de89 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkMode.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkMode.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java b/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java index 75b596bdeff..79c4c447fbc 100644 --- a/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java +++ b/engine/src/main/java/org/terasology/engine/network/NetworkSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/NoReplicate.java b/engine/src/main/java/org/terasology/engine/network/NoReplicate.java index ba3f1b31cc6..bb7a9bd7862 100644 --- a/engine/src/main/java/org/terasology/engine/network/NoReplicate.java +++ b/engine/src/main/java/org/terasology/engine/network/NoReplicate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java b/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java index 3510462dde3..282f5209b39 100644 --- a/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/OwnerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/PingService.java b/engine/src/main/java/org/terasology/engine/network/PingService.java index adc77c3afa5..836fe776664 100644 --- a/engine/src/main/java/org/terasology/engine/network/PingService.java +++ b/engine/src/main/java/org/terasology/engine/network/PingService.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java b/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java index 36f602e6e64..7bafa8f1c00 100644 --- a/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/PingStockComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java b/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java index 9bc5bed6417..77be6630fd6 100644 --- a/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java +++ b/engine/src/main/java/org/terasology/engine/network/PingSubscriberComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/network/Replicate.java b/engine/src/main/java/org/terasology/engine/network/Replicate.java index 05142a67bf0..b891a90b50b 100644 --- a/engine/src/main/java/org/terasology/engine/network/Replicate.java +++ b/engine/src/main/java/org/terasology/engine/network/Replicate.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java b/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java index 0199fea2314..ed8f5c99fb4 100644 --- a/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/ReplicationCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/Server.java b/engine/src/main/java/org/terasology/engine/network/Server.java index 21c1898e067..449cacc5845 100644 --- a/engine/src/main/java/org/terasology/engine/network/Server.java +++ b/engine/src/main/java/org/terasology/engine/network/Server.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.Component; @@ -21,8 +8,6 @@ import org.terasology.protobuf.NetData; import org.terasology.engine.world.chunks.remoteChunkProvider.ChunkReadyListener; -/** - */ public interface Server extends ChunkReadyListener { EntityRef getClientEntity(); diff --git a/engine/src/main/java/org/terasology/engine/network/ServerEvent.java b/engine/src/main/java/org/terasology/engine/network/ServerEvent.java index 80c80a392bc..6fcf8c71248 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java b/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java index 0fdebad00a7..b0e7417b9e2 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerInfoMessage.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java b/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java index 2846d15d739..2bcd996244e 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerInfoService.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java b/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java index 0365beccacd..9f3cd5c70de 100644 --- a/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java +++ b/engine/src/main/java/org/terasology/engine/network/ServerPingSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network; import org.terasology.engine.entitySystem.entity.EntityManager; diff --git a/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java b/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java index cf49e49045a..0ac5a0794b1 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/ConnectedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; diff --git a/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java b/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java index 8f2e31b093a..25b70e460cd 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/DisconnectedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; diff --git a/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java b/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java index 575d92701d0..921ca21aaa9 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/PingFromClientEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java b/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java index ea356920714..0c1517224d6 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/PingFromServerEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java b/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java index 61b50f7a640..ace0503dce2 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/SubscribePingEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java b/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java index cae07abdc1c..61e443277d7 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java +++ b/engine/src/main/java/org/terasology/engine/network/events/UnSubscribePingEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/network/events/package-info.java b/engine/src/main/java/org/terasology/engine/network/events/package-info.java index 549e1e4e049..f5333c7c9cb 100644 --- a/engine/src/main/java/org/terasology/engine/network/events/package-info.java +++ b/engine/src/main/java/org/terasology/engine/network/events/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.network.events; diff --git a/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java b/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java index c49eabe9d39..ad13b939e15 100644 --- a/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java +++ b/engine/src/main/java/org/terasology/engine/network/exceptions/HostingFailedException.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.exceptions; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java b/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java index 009494dc6a8..7253ae06f2a 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/AbstractClient.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java index d565538680b..7308873f5cb 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java index 068ed549559..6626b686981 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ClientHandshakeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java b/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java index 820ea5cfe9f..ddbb6a92565 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/HandshakeCommon.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import com.google.common.primitives.Bytes; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java b/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java index af4a1de0e92..031a0083ade 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/JoinStatusImpl.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import com.google.common.util.concurrent.AtomicDouble; import org.terasology.engine.network.JoinStatus; -/** - */ public class JoinStatusImpl implements JoinStatus { private Status status = Status.IN_PROGRESS; private String currentActivity = ""; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java index 5bafe2dc3c3..51df1755379 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/MetricRecordingHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java b/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java index defff58cc41..7484210d6f6 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java b/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java index 7d04e4dad08..2b2b1d1c8a9 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetworkClientRefStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import org.terasology.engine.entitySystem.entity.LowLevelEntityManager; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.entity.internal.DefaultRefStrategy; import org.terasology.engine.network.NetworkComponent; -/** - */ public class NetworkClientRefStrategy extends DefaultRefStrategy { private NetworkSystemImpl system; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java b/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java index ccb7ac48b10..e09cdfeab2b 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetworkEntitySystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java b/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java index ad12a47410f..19e3570f2da 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/NetworkSystemImpl.java @@ -71,7 +71,6 @@ import org.terasology.engine.world.block.family.BlockFamily; import org.terasology.engine.world.chunks.remoteChunkProvider.RemoteChunkProvider; import org.terasology.engine.world.generator.WorldGenerator; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.module.Module; import org.terasology.nui.Color; import org.terasology.persistence.typeHandling.TypeHandlerLibrary; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java index 5a541d12e97..24021b0b498 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerConnectionHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; @@ -22,9 +22,7 @@ import java.io.InputStream; import java.util.List; -/** - * - */ + public class ServerConnectionHandler extends ChannelInboundHandlerAdapter { private static final Logger logger = LoggerFactory.getLogger(ServerConnectionHandler.class); diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java index a08739b45c0..3af1768065b 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java index a1c85292953..8e72f78817f 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerHandshakeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java index 854b2bb4c36..a224fb57041 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoMessageImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java index ba04ef8df91..d92a56ae7e9 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/ServerInfoRequestHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal; import io.netty.channel.ChannelHandlerContext; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java index 2bac2d8a1b9..39c1befda8a 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/InfoRequestPipelineFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal.pipelineFactory; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java index 6190d964543..ab463d96024 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyClientPipelineFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal.pipelineFactory; diff --git a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java index bd6caf95678..d8b847cf46a 100644 --- a/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java +++ b/engine/src/main/java/org/terasology/engine/network/internal/pipelineFactory/TerasologyServerPipelineFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.internal.pipelineFactory; diff --git a/engine/src/main/java/org/terasology/engine/network/package-info.java b/engine/src/main/java/org/terasology/engine/network/package-info.java index cbf8acdc68f..7190c3934ba 100644 --- a/engine/src/main/java/org/terasology/engine/network/package-info.java +++ b/engine/src/main/java/org/terasology/engine/network/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.network; diff --git a/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java b/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java index 16c3415f4ef..07d8d7ac29a 100644 --- a/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/serialization/ClientComponentFieldCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.serialization; diff --git a/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java b/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java index dd46ca608de..31d9a426d20 100644 --- a/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/serialization/NetComponentSerializeCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.serialization; diff --git a/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java b/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java index f75f7e1c895..eac5f1fc5ad 100644 --- a/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java +++ b/engine/src/main/java/org/terasology/engine/network/serialization/ServerComponentFieldCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.network.serialization; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleData.java b/engine/src/main/java/org/terasology/engine/particles/ParticleData.java index ffd499a3f77..70a6a9f3c78 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleData.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleData.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.joml.Vector2f; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java b/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java index a3253d82cfb..8cdcbdcdc1f 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java b/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java index 7736051872e..4a5fb9cb9b0 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticlePool.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java index 7735dc3bd17..9389a3c010e 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java index aad482cfa47..89ace8e87ec 100644 --- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java +++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles; import org.terasology.engine.core.module.ModuleManager; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java index ad8256cf6db..8b520a7706c 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components; import org.joml.Vector2f; @@ -20,9 +7,7 @@ import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.rendering.assets.texture.Texture; -/** - * - */ + @API public class ParticleDataSpriteComponent implements Component { /** diff --git a/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java index 65e7a34ee7d..55b52f4ab5e 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java index da730374bd4..15088f43c60 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.affectors; import org.joml.Vector3f; @@ -20,9 +7,7 @@ import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.network.Replicate; -/** - * - */ + @API public class AccelerationAffectorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java index 121407c5ed9..0d1bb366e1b 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java @@ -1,26 +1,11 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.affectors; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class VelocityAffectorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java index 4cb06c0ca61..ab546806612 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector4f; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class ColorRangeGeneratorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java index 9f7b957b703..4b1323028cb 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java @@ -1,26 +1,11 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class EnergyRangeGeneratorComponent implements Component { public float minEnergy = 100.0f; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java index 86240ad26fc..305c323ee0c 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class PositionRangeGeneratorComponent implements Component { diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java index fe34a146e1a..2c6ec90e4c9 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector3f; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; -/** - * - */ + @API public class ScaleRangeGeneratorComponent implements Component { public Vector3f minScale; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java index 7b32f400742..8f4f7e04b01 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector2f; diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java index 1cbb6cde742..69c884d511b 100644 --- a/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java +++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.components.generators; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java b/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java index 9079ff06ba0..0df00c43267 100644 --- a/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java +++ b/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.events; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java index 0920c22912b..86913cf8c25 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/ParticleSystemFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions; import org.terasology.engine.particles.ParticleDataMask; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java index 801cd79c2a5..3c25778213f 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions; import org.terasology.gestalt.module.sandbox.API; @@ -28,4 +15,4 @@ @API @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface RegisterParticleSystemFunction {} +public @interface RegisterParticleSystemFunction { } diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java index e4571df87e3..a5d1cd0f536 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AccelerationAffectorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.affectors; import org.terasology.engine.particles.ParticleData; @@ -21,9 +8,7 @@ import org.terasology.engine.particles.functions.RegisterParticleSystemFunction; import org.terasology.engine.utilities.random.Random; -/** - * - */ + @RegisterParticleSystemFunction() public final class AccelerationAffectorFunction extends AffectorFunction { public AccelerationAffectorFunction() { diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java index 05eb138dc31..2f1eb910b9e 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.affectors; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java index ab7d3a01dd2..d252b401c7d 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/VelocityAffectorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.affectors; import org.terasology.engine.particles.ParticleData; @@ -21,9 +8,7 @@ import org.terasology.engine.particles.functions.RegisterParticleSystemFunction; import org.terasology.engine.utilities.random.Random; -/** - * - */ + @RegisterParticleSystemFunction() public final class VelocityAffectorFunction extends AffectorFunction { public VelocityAffectorFunction() { diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java index 70bbe046109..7fadf55ca37 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ColorRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java index 271ee109da4..d7f6a00dc41 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/EnergyRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java index f857708e1f5..da9ad2afc66 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java index 3421c42a56c..6e3b57d888b 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/PositionRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java index c771418edbe..7d3cbef184e 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/ScaleRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java index ba5fddf7f9a..6deec569a12 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/TextureOffsetGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.joml.Vector2f; diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java index 0f9ba4924aa..0074608cbf0 100644 --- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java +++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/VelocityRangeGeneratorFunction.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.functions.generators; import org.terasology.engine.particles.ParticleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java b/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java index c8578e2826b..92189e4e8b9 100644 --- a/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java +++ b/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java @@ -1,27 +1,12 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.rendering; import org.terasology.engine.entitySystem.Component; import org.terasology.gestalt.module.sandbox.API; import org.terasology.engine.particles.ParticlePool; -/** - * - */ + @API public final class ParticleRenderingData { public final E particleData; diff --git a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java index da90486bbb3..0693ff25977 100644 --- a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java +++ b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdater.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.updating; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java index ef149748db8..df60a3f6080 100644 --- a/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java +++ b/engine/src/main/java/org/terasology/engine/particles/updating/ParticleUpdaterImpl.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.particles.updating; diff --git a/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java b/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java index 27032e7ab65..0374d3f9dae 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java +++ b/engine/src/main/java/org/terasology/engine/persistence/ChunkStore.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.joml.Vector3i; diff --git a/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java b/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java index 4bc76c7e616..8c5827fc227 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java +++ b/engine/src/main/java/org/terasology/engine/persistence/PlayerStore.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.joml.Vector3fc; import org.terasology.engine.entitySystem.entity.EntityRef; -/** - */ public interface PlayerStore { /** diff --git a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java index aa59669fc1e..6e332f7d7c9 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java +++ b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; diff --git a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java index 7b2b78e14fe..b36554c826a 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java +++ b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; diff --git a/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java b/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java index 4a4827202cd..6cd7644f2dc 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java +++ b/engine/src/main/java/org/terasology/engine/persistence/WorldDumper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence; import org.terasology.engine.core.TerasologyConstants; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java b/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java index 384efcb6d1f..cc399c75ac5 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/AbstractStorageManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java b/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java index e0ac802341f..b3d7fb66919 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/ChunkStoreInternal.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager; @@ -24,8 +11,6 @@ import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager; import org.terasology.engine.world.chunks.internal.ChunkSerializer; -/** - */ final class ChunkStoreInternal implements ChunkStore { private Vector3i chunkPosition; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java index 757e8ae5b69..eb6c6ac60d8 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/CompressedChunkBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java index b0c117f76c0..03bbf138134 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java index 00b3198f74d..6021a4ab902 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefCopyStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java index a4269f555fe..0ec0a492e65 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/DelayedEntityRefFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; /** diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java index a3e07f3077a..b0e765bea44 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityDelta.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java index 4e649444619..ab874f68d75 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityRestorer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; @@ -26,8 +13,6 @@ import java.util.Map; -/** - */ final class EntityRestorer { private EngineEntityManager entityManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java index 548beaa0bfb..2d929c91697 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntitySetDeltaRecorder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.MapMaker; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java index 1540b56b5a0..2f37667cb6b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/EntityStorer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java b/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java index 617e69506d0..76a526adc9e 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/GamePreviewImageProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java index 14d3714ebb2..3fd3e3e138c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; @@ -30,8 +17,6 @@ import java.util.Map; import java.util.Set; -/** - */ final class GlobalStoreBuilder { private final long nextEntityId; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java index a3164234512..f2858c19d98 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/GlobalStoreLoader.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; @@ -39,8 +26,6 @@ import java.util.Map; import java.util.Optional; -/** - */ final class GlobalStoreLoader { private static final Logger logger = LoggerFactory.getLogger(GlobalStoreLoader.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java index 0a5658f5a9d..6440396a734 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Sets; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java index 14eb731182a..eb6db88d515 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/PlayerStoreInternal.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.joml.Vector3f; @@ -25,8 +12,6 @@ import java.util.Map; -/** - */ final class PlayerStoreInternal implements PlayerStore { static final String CHARACTER = "character"; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java b/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java index 3d15479ba6f..20655d8fc92 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/ReadOnlyStorageManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java index e524bdd30ad..4e528e9b473 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionBuilder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import com.google.common.collect.Maps; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java index 0d013955ff1..dcbb31d326b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionHelper.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java index bd60757e64b..b6cd1a0efaa 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/SaveTransactionResult.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; /** diff --git a/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java b/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java index e8cb4f4a4db..115109c9f7b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java +++ b/engine/src/main/java/org/terasology/engine/persistence/internal/StoragePathProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.internal; import org.joml.Vector3i; @@ -22,8 +9,6 @@ import java.nio.file.Path; -/** - */ public class StoragePathProvider { private static final String PLAYERS_PATH = "players"; private static final String WORLDS_PATH = "worlds"; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java index 1f10e78d964..160d6d24d6c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/ComponentSerializeCheck.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java index b7cc4d8cea0..c020ddf7599 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/EntityDataJSONFormat.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; import com.google.gson.Gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java index 193d2711b29..986272e5781 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/EventSerializer.java @@ -24,8 +24,6 @@ import java.util.Map; -/** - */ public class EventSerializer { private static final Logger logger = LoggerFactory.getLogger(ComponentSerializer.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java index 3a3a0d3877f..f96a4eb70b7 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/NetworkEntitySerializer.java @@ -31,8 +31,6 @@ import java.util.Map; import java.util.Set; -/** - */ public class NetworkEntitySerializer { private static final Logger logger = LoggerFactory.getLogger(NetworkEntitySerializer.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java index 86274e6b078..746c14e4639 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializer.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java index d9d1812bc19..a6ff384f0d4 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java +++ b/engine/src/main/java/org/terasology/engine/persistence/serializers/WorldSerializerImpl.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.serializers; import com.google.common.collect.ArrayListMultimap; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java index 600553cf880..1bf72160ec7 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java index f70856f15ad..01d7f2b01ee 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java index c0b69f45edd..e862224e97f 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/AssetTypeHandler.java @@ -10,8 +10,6 @@ import java.util.Optional; -/** - */ public class AssetTypeHandler extends StringRepresentationTypeHandler { private Class assetClass; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java index 23a63d7b234..844612a4c25 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/BlockTypeHandler.java @@ -6,8 +6,6 @@ import org.terasology.engine.world.block.BlockManager; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class BlockTypeHandler extends StringRepresentationTypeHandler { private BlockManager blockManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java index 307da20b3e9..be41c053c0a 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/ChunkMeshTypeHandler.java @@ -4,9 +4,7 @@ package org.terasology.engine.persistence.typeHandling.extensionTypes; import org.lwjgl.BufferUtils; -import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.primitives.ChunkMesh; -import org.terasology.engine.rendering.primitives.ChunkTessellator; import org.terasology.persistence.typeHandling.PersistedData; import org.terasology.persistence.typeHandling.PersistedDataSerializer; import org.terasology.persistence.typeHandling.TypeHandler; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java index 3ba39d83488..4de6c4932af 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/CollisionGroupTypeHandler.java @@ -7,8 +7,6 @@ import org.terasology.engine.physics.CollisionGroupManager; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class CollisionGroupTypeHandler extends StringRepresentationTypeHandler { private CollisionGroupManager groupManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java index 61377cf419d..6f6ff8a9ec6 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/EntityRefTypeHandler.java @@ -13,8 +13,6 @@ import java.util.List; import java.util.Optional; -/** - */ public class EntityRefTypeHandler extends TypeHandler { private EngineEntityManager entityManager; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java index acaa109e722..fdb2940ec9f 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/NameTypeHandler.java @@ -6,8 +6,6 @@ import org.terasology.gestalt.naming.Name; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class NameTypeHandler extends StringRepresentationTypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java index ae36eba00a0..ab003475a70 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java @@ -7,8 +7,6 @@ import org.terasology.engine.utilities.Assets; import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; -/** - */ public class PrefabTypeHandler extends StringRepresentationTypeHandler { public PrefabTypeHandler() { diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java index e0fa00e11be..daaeaae40fb 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/TextureRegionTypeHandler.java @@ -12,8 +12,6 @@ import java.util.Optional; -/** - */ public class TextureRegionTypeHandler extends StringRepresentationTypeHandler { private static final Logger logger = LoggerFactory.getLogger(TextureRegionTypeHandler.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java index 860784369cc..e96045e9da5 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/UITextureRegionTypeHandler.java @@ -12,8 +12,6 @@ import java.util.Optional; -/** - */ // NOTE: This is a copy of TextureRegionTypeHandler that is to be used with UITextureRegions public class UITextureRegionTypeHandler extends StringRepresentationTypeHandler { private static final Logger logger = LoggerFactory.getLogger(UITextureRegionTypeHandler.class); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java index 4d9acc4be01..6d1b0179689 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/extensionTypes/factories/ComponentClassTypeHandlerFactory.java @@ -12,7 +12,7 @@ public class ComponentClassTypeHandlerFactory extends SpecificTypeHandlerFactory> { public ComponentClassTypeHandlerFactory() { - super(new TypeInfo>() {}); + super(new TypeInfo>() { }); } @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java index eecc257d758..54279b36922 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/AbstractGsonPersistedData.java @@ -11,8 +11,6 @@ import java.nio.ByteBuffer; -/** - */ public abstract class AbstractGsonPersistedData implements PersistedData { private byte[] cachedDecodedBytes; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java index 25ed7a2a22f..e03858d1a20 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonMapExclusionStrategy.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.ExclusionStrategy; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java index b80dcb4ba61..f1236c0038c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedData.java @@ -1,24 +1,9 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.JsonElement; -/** - */ public class GsonPersistedData extends AbstractGsonPersistedData { private final JsonElement element; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java index 2ea18adf9f0..1e1cbb29249 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataArray.java @@ -19,8 +19,6 @@ import java.util.Iterator; import java.util.List; -/** - */ public class GsonPersistedDataArray extends AbstractGsonPersistedData implements PersistedDataArray { private JsonArray array; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java index 4212366ee16..9d27385248f 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataMap.java @@ -13,8 +13,6 @@ import java.util.Map; import java.util.Set; -/** - */ public class GsonPersistedDataMap extends AbstractGsonPersistedData implements PersistedDataMap { private JsonObject map; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java index 1143ddac7e2..68e2f3b214c 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataReader.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java index 64263ce784f..c2f0c6c2560 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataSerializer.java @@ -18,8 +18,6 @@ import java.util.Arrays; import java.util.Map; -/** - */ public class GsonPersistedDataSerializer implements PersistedDataSerializer { private static final PersistedData NULL_INSTANCE = new GsonPersistedData(JsonNull.INSTANCE); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java index 2c4291847e7..e005e7164a0 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/GsonPersistedDataWriter.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java index a26f45137ed..005b8904c0b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/gson/PolymorphicTypeAdapterFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.gson; import com.google.gson.Gson; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java index 644e8befa5c..aca72bc0279 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreaTypeHandler.java @@ -39,8 +39,8 @@ public Optional deserialize(PersistedData data) { PersistedDataArray sizedataArray = map.get(SIZE_FIELD).getAsArray(); TIntList sizeArr = sizedataArray.getAsIntegerArray(); return Optional.of( - new BlockArea(minArr.get(0), minArr.get(1)) - .setSize(sizeArr.get(0), sizeArr.get(1))); + new BlockArea(minArr.get(0), minArr.get(1)) + .setSize(sizeArr.get(0), sizeArr.get(1))); } PersistedDataArray maxDataArr = map.get(MAX_FIELD).getAsArray(); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java index 63091fd46da..f6b9a35e281 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/BlockAreacTypeHandler.java @@ -40,8 +40,8 @@ public Optional deserialize(PersistedData data) { PersistedDataArray sizedataArray = map.get(SIZE_FIELD).getAsArray(); TIntList sizeArr = sizedataArray.getAsIntegerArray(); return Optional.of( - new BlockArea(minArr.get(0), minArr.get(1)) - .setSize(sizeArr.get(0), sizeArr.get(1))); + new BlockArea(minArr.get(0), minArr.get(1)) + .setSize(sizeArr.get(0), sizeArr.get(1))); } PersistedDataArray maxDataArr = map.get(MAX_FIELD).getAsArray(); diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java index f7ef6ae3c8b..702d01138e5 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/QuaternionfTypeHandler.java @@ -11,8 +11,6 @@ import java.util.Optional; -/** - */ public class QuaternionfTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java index b9b29107cae..ca1400c9bc1 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2fTypeHandler.java @@ -12,8 +12,6 @@ import java.util.Optional; -/** - */ public class Vector2fTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java index f78d99724a4..beb0f1fe0dc 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector2iTypeHandler.java @@ -11,8 +11,6 @@ import java.util.Optional; -/** - */ public class Vector2iTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java index 9025e90d978..b3f65278ed5 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3fTypeHandler.java @@ -11,8 +11,6 @@ import java.util.Optional; -/** - */ public class Vector3fTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java index 4ae4d18906a..66ef51e511b 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector3iTypeHandler.java @@ -11,8 +11,6 @@ import java.util.Optional; -/** - */ public class Vector3iTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java index 2841156d74e..94e05116b44 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/mathTypes/Vector4fTypeHandler.java @@ -11,8 +11,6 @@ import java.util.Optional; -/** - */ public class Vector4fTypeHandler extends TypeHandler { @Override diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java index 1ffcda55b18..8b50c601272 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataReader.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.protobuf; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java index 8525e175b93..fce33737756 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufDataWriter.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.persistence.typeHandling.protobuf; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java index 358a6ba990b..1c25140afd3 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java @@ -31,8 +31,6 @@ import java.util.List; import java.util.Map; -/** - */ public class ProtobufPersistedData implements PersistedData, PersistedDataArray { private EntityData.Value data; diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java index 3e8e4fbf873..3a2554b3f6e 100644 --- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java +++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedDataSerializer.java @@ -15,8 +15,6 @@ import java.util.Arrays; import java.util.Map; -/** - */ public class ProtobufPersistedDataSerializer implements PersistedDataSerializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java b/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java index 602e94981a0..f0399240bbc 100644 --- a/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java +++ b/engine/src/main/java/org/terasology/engine/physics/CollisionGroup.java @@ -1,23 +1,8 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; -/** - */ public interface CollisionGroup { short getFlag(); diff --git a/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java b/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java index 02bbedea38c..ed937ef5fba 100644 --- a/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java +++ b/engine/src/main/java/org/terasology/engine/physics/CollisionGroupManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; @@ -23,8 +10,6 @@ import java.util.Locale; import java.util.Map; -/** - */ public class CollisionGroupManager { private Map collisionGroupMap = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/physics/HitResult.java b/engine/src/main/java/org/terasology/engine/physics/HitResult.java index a9f467eb066..445347727a7 100644 --- a/engine/src/main/java/org/terasology/engine/physics/HitResult.java +++ b/engine/src/main/java/org/terasology/engine/physics/HitResult.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; diff --git a/engine/src/main/java/org/terasology/engine/physics/Physics.java b/engine/src/main/java/org/terasology/engine/physics/Physics.java index f3a0e0684d5..ec6147e26a6 100644 --- a/engine/src/main/java/org/terasology/engine/physics/Physics.java +++ b/engine/src/main/java/org/terasology/engine/physics/Physics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; import org.terasology.joml.geom.AABBf; @@ -22,8 +9,6 @@ import java.util.List; import java.util.Set; -/** - */ public interface Physics { /** * Executes a rayTrace on the physics engine. diff --git a/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java b/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java index ef9b3c9178b..c4563b1ad1c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java +++ b/engine/src/main/java/org/terasology/engine/physics/StandardCollisionGroup.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics; import java.util.Locale; -/** - */ public enum StandardCollisionGroup implements CollisionGroup { NONE((short) 0b00000000), DEFAULT((short) 0b00000001), diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java index 7625755a780..683ad940c77 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletPhysics.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet; @@ -106,6 +106,14 @@ public class BulletPhysics implements PhysicsEngine { private final btGhostPairCallback ghostPairCallback; + /** + * Creates a Collider for the given entity based on the LocationComponent and CharacterMovementComponent. All + * collision flags are set right for a character movement component. + * + * @param owner the entity to create the collider for. + * @return + */ + private ArrayList shapes = Lists.newArrayList(); public BulletPhysics() { @@ -116,7 +124,8 @@ public BulletPhysics() { dispatcher = new btCollisionDispatcher(defaultCollisionConfiguration); sequentialImpulseConstraintSolver = new btSequentialImpulseConstraintSolver(); - discreteDynamicsWorld = new btDiscreteDynamicsWorld(dispatcher, broadphase, sequentialImpulseConstraintSolver, defaultCollisionConfiguration); + discreteDynamicsWorld = + new btDiscreteDynamicsWorld(dispatcher, broadphase, sequentialImpulseConstraintSolver, defaultCollisionConfiguration); discreteDynamicsWorld.setGravity(new Vector3f(0f, -PhysicsEngine.GRAVITY, 0f)); blockEntityRegistry = CoreRegistry.get(BlockEntityRegistry.class); @@ -124,11 +133,10 @@ public BulletPhysics() { } - public btDiscreteDynamicsWorld getWorld() { return discreteDynamicsWorld; } - //*****************Physics Interface methods******************\\ + //*****************Physics Interface methods******************\\ @Override public List getCollisionPairs() { @@ -142,8 +150,8 @@ public void dispose() { this.discreteDynamicsWorld.dispose(); this.dispatcher.dispose(); this.defaultCollisionConfiguration.dispose(); - this.entityTriggers.forEach((k,v) -> v.dispose()); - this.entityRigidBodies.forEach((k,v)-> v.dispose()); + this.entityTriggers.forEach((k, v) -> v.dispose()); + this.entityRigidBodies.forEach((k, v) -> v.dispose()); this.ghostPairCallback.dispose(); } @@ -171,10 +179,12 @@ public List scanArea(AABBf area, Iterable collisionFi // TODO: Add the aabbTest method from newer versions of bullet to TeraBullet, use that instead - Vector3f extent = new Vector3f((area.maxX - area.minX) / 2.0f, (area.maxY - area.minY) / 2.0f, (area.maxZ - area.minZ) / 2.0f); + Vector3f extent = new Vector3f((area.maxX - area.minX) / 2.0f, (area.maxY - area.minY) / 2.0f, + (area.maxZ - area.minZ) / 2.0f); btBoxShape shape = new btBoxShape(extent); - btGhostObject scanObject = createCollider(new Vector3f(area.minX, area.minY, area.minZ).add(extent), shape, StandardCollisionGroup.SENSOR.getFlag(), - combineGroups(collisionFilter), btCollisionObject.CollisionFlags.CF_NO_CONTACT_RESPONSE); + btGhostObject scanObject = createCollider(new Vector3f(area.minX, area.minY, area.minZ).add(extent), shape, + StandardCollisionGroup.SENSOR.getFlag(), + combineGroups(collisionFilter), btCollisionObject.CollisionFlags.CF_NO_CONTACT_RESPONSE); // This in particular is overkill broadphase.calculateOverlappingPairs(dispatcher); @@ -239,8 +249,8 @@ public HitResult rayTrace(Vector3f from1, Vector3f direction, float distance, Se callback.dispose(); if (collisionObject.userData instanceof EntityRef) { //we hit an other entity return new HitResult((EntityRef) collisionObject.userData, - hitPointWorld, - hitNormalWorld); + hitPointWorld, + hitNormalWorld); } else if ((collisionObject.getCollisionFlags() & btCollisionObject.CollisionFlags.CF_VOXEL_OBJECT) > 0) { btVector3i pos = new btVector3i(); collisionObject.getVoxelPosition(pos); @@ -248,9 +258,9 @@ public HitResult rayTrace(Vector3f from1, Vector3f direction, float distance, Se Vector3i voxelPosition = new Vector3i(pos.getX(), pos.getY(), pos.getZ()); final EntityRef entityAt = blockEntityRegistry.getEntityAt(voxelPosition); return new HitResult(entityAt, - hitPointWorld, - hitNormalWorld, - voxelPosition); + hitPointWorld, + hitNormalWorld, + voxelPosition); } else { //we hit something we don't understand, assume its nothing and log a warning logger.warn("Unidentified object was hit in the physics engine: {}", collisionObject.userData); } @@ -374,7 +384,8 @@ public boolean removeTrigger(EntityRef entity) { public boolean updateTrigger(EntityRef entity) { LocationComponent location = entity.getComponent(LocationComponent.class); if (location == null) { - logger.warn("Trying to update or create trigger of entity that has no LocationComponent?! Entity: {}", entity); + logger.warn("Trying to update or create trigger of entity that has no LocationComponent?! Entity: {}", + entity); return false; } btPairCachingGhostObject triggerObj = entityTriggers.get(entity); @@ -477,7 +488,7 @@ private boolean newTrigger(EntityRef entity) { btCollisionShape shape = getShapeFor(entity); if (shape != null && location != null && trigger != null) { float scale = location.getWorldScale(); - shape.setLocalScaling(new Vector3f(scale,scale,scale)); + shape.setLocalScaling(new Vector3f(scale, scale, scale)); List detectGroups = Lists.newArrayList(trigger.detectGroups); CollisionGroup collisionGroup = trigger.collisionGroup; btPairCachingGhostObject triggerObj = createCollider( @@ -503,31 +514,25 @@ private boolean newTrigger(EntityRef entity) { } } - /** - * Creates a Collider for the given entity based on the LocationComponent - * and CharacterMovementComponent. - * All collision flags are set right for a character movement component. - * - * @param owner the entity to create the collider for. - * @return - */ - private ArrayList shapes = Lists.newArrayList(); private CharacterCollider createCharacterCollider(EntityRef owner) { LocationComponent locComp = owner.getComponent(LocationComponent.class); CharacterMovementComponent movementComp = owner.getComponent(CharacterMovementComponent.class); if (locComp == null || movementComp == null) { - throw new IllegalArgumentException("Expected an entity with a Location component and CharacterMovementComponent."); + throw new IllegalArgumentException("Expected an entity with a Location component and " + + "CharacterMovementComponent."); } Vector3f pos = locComp.getWorldPosition(new Vector3f()); final float worldScale = locComp.getWorldScale(); final float height = (movementComp.height - 2 * movementComp.radius) * worldScale; final float width = movementComp.radius * worldScale; - btConvexShape shape = new btCapsuleShape(width , height); + btConvexShape shape = new btCapsuleShape(width, height); shapes.add(shape); shape.setMargin(0.1f); - return createCustomCollider(pos, shape, movementComp.collisionGroup.getFlag(), combineGroups(movementComp.collidesWith), + return createCustomCollider(pos, shape, movementComp.collisionGroup.getFlag(), + combineGroups(movementComp.collidesWith), btCollisionObject.CollisionFlags.CF_CHARACTER_OBJECT, owner); } + private RigidBody newRigidBody(EntityRef entity) { LocationComponent location = entity.getComponent(LocationComponent.class); RigidBodyComponent rigidBody = entity.getComponent(RigidBodyComponent.class); @@ -537,13 +542,15 @@ private RigidBody newRigidBody(EntityRef entity) { shape.setLocalScaling(new Vector3f(scale, scale, scale)); if (rigidBody.mass < 1) { - logger.warn("RigidBodyComponent.mass is set to less than 1.0, this can lead to strange behaviour, such as the objects moving through walls. " + + logger.warn("RigidBodyComponent.mass is set to less than 1.0, this can lead to strange behaviour, " + + "such as the objects moving through walls. " + "Entity: {}", entity); } Vector3f inertia = new Vector3f(); - shape.calculateLocalInertia(rigidBody.mass,inertia); + shape.calculateLocalInertia(rigidBody.mass, inertia); - btRigidBody.btRigidBodyConstructionInfo info = new btRigidBody.btRigidBodyConstructionInfo(rigidBody.mass, new EntityMotionState(entity), shape, inertia); + btRigidBody.btRigidBodyConstructionInfo info = + new btRigidBody.btRigidBodyConstructionInfo(rigidBody.mass, new EntityMotionState(entity), shape, inertia); BulletRigidBody collider = new BulletRigidBody(info); collider.rb.userData = entity; collider.rb.setAngularFactor(rigidBody.angularFactor); @@ -551,7 +558,8 @@ private RigidBody newRigidBody(EntityRef entity) { collider.rb.setFriction(rigidBody.friction); collider.collidesWith = combineGroups(rigidBody.collidesWith); collider.setVelocity(rigidBody.velocity, rigidBody.angularVelocity); - collider.setTransform(location.getWorldPosition(new Vector3f()), location.getWorldRotation(new Quaternionf())); + collider.setTransform(location.getWorldPosition(new Vector3f()), + location.getWorldRotation(new Quaternionf())); updateKinematicSettings(rigidBody, collider); BulletRigidBody oldBody = entityRigidBodies.put(entity, collider); addRigidBody(collider, Lists.newArrayList(rigidBody.collisionGroup), rigidBody.collidesWith); @@ -560,7 +568,8 @@ private RigidBody newRigidBody(EntityRef entity) { } return collider; } else { - throw new IllegalArgumentException("Can only create a new rigid body for entities with a LocationComponent," + + throw new IllegalArgumentException("Can only create a new rigid body for entities with a " + + "LocationComponent," + " RigidBodyComponent and ShapeComponent, this entity misses at least one: " + entity); } } @@ -571,36 +580,35 @@ private void removeCollider(btCollisionObject collider) { } /** - * Creates a new Collider. Colliders are similar to rigid bodies, except - * that they do not respond to forces from the physics engine. They collide - * with other objects and other objects may move if colliding with a - * collider, but the collider itself will only respond to movement orders - * from outside the physics engine. Colliders also detect any objects - * colliding with them. Allowing them to be used as sensors. + * Creates a new Collider. Colliders are similar to rigid bodies, except that they do not respond to forces from the + * physics engine. They collide with other objects and other objects may move if colliding with a collider, but the + * collider itself will only respond to movement orders from outside the physics engine. Colliders also detect any + * objects colliding with them. Allowing them to be used as sensors. * - * @param pos The initial position of the collider. - * @param shape The shape of this collider. + * @param pos The initial position of the collider. + * @param shape The shape of this collider. * @param groups * @param filters * @param collisionFlags - * @param entity The entity to associate this collider with. Can be null. + * @param entity The entity to associate this collider with. Can be null. * @return The newly created and added to the physics engine, Collider object. */ - private CharacterCollider createCustomCollider(Vector3f pos, btConvexShape shape, short groups, short filters, int collisionFlags, EntityRef entity) { + private CharacterCollider createCustomCollider(Vector3f pos, btConvexShape shape, short groups, short filters, + int collisionFlags, EntityRef entity) { if (entityColliders.containsKey(entity)) { entityColliders.remove(entity); } - final BulletCharacterMoverCollider bulletCollider = new BulletCharacterMoverCollider(pos, shape, groups, filters, collisionFlags, entity); + final BulletCharacterMoverCollider bulletCollider = new BulletCharacterMoverCollider(pos, shape, groups, + filters, collisionFlags, entity); entityColliders.put(entity, bulletCollider); return bulletCollider; } /** - * To make sure the state of the physics engine is constant, all changes are - * stored and executed at the same time. This method executes the stored - * additions and removals of bodies to and from the physics engine. It also - * ensures that impulses requested before the body is added to the engine - * are applied after the body is added to the engine. + * To make sure the state of the physics engine is constant, all changes are stored and executed at the same time. + * This method executes the stored additions and removals of bodies to and from the physics engine. It also ensures + * that impulses requested before the body is added to the engine are applied after the body is added to the + * engine. */ // TODO: None of the above is true. // TODO: This isn't necessary, create and remove bodies immediately @@ -611,7 +619,7 @@ private synchronized void processQueuedBodies() { } while (!removalQueue.isEmpty()) { BulletRigidBody body = removalQueue.poll(); - if(body.isDisposed) { + if (body.isDisposed) { continue; } discreteDynamicsWorld.removeRigidBody(body.rb); @@ -620,14 +628,13 @@ private synchronized void processQueuedBodies() { } /** - * Applies all pending impulses to the corresponding rigidBodies and clears - * the pending impulses. + * Applies all pending impulses to the corresponding rigidBodies and clears the pending impulses. */ private void applyPendingImpulsesAndForces() { for (Map.Entry entree : entityRigidBodies.entrySet()) { BulletRigidBody body = entree.getValue(); - if(body.pendingImpulse.lengthSquared() > .01f || body.pendingForce.lengthSquared() > .01f ) { + if (body.pendingImpulse.lengthSquared() > .01f || body.pendingForce.lengthSquared() > .01f) { body.rb.applyCentralImpulse(body.pendingImpulse); body.rb.applyCentralForce(body.pendingForce); } @@ -642,9 +649,12 @@ private void applyPendingImpulsesAndForces() { } private void addRigidBody(BulletRigidBody body) { - - short filter = (short) (btBroadphaseProxy.CollisionFilterGroups.DefaultFilter | btBroadphaseProxy.CollisionFilterGroups.StaticFilter| btBroadphaseProxy.CollisionFilterGroups.SensorTrigger); - insertionQueue.add(new RigidBodyRequest(body, (short) btBroadphaseProxy.CollisionFilterGroups.DefaultFilter, filter)); + short filter = + (short) (btBroadphaseProxy.CollisionFilterGroups.DefaultFilter + | btBroadphaseProxy.CollisionFilterGroups.StaticFilter + | btBroadphaseProxy.CollisionFilterGroups.SensorTrigger); + insertionQueue.add(new RigidBodyRequest(body, (short) btBroadphaseProxy.CollisionFilterGroups.DefaultFilter, + filter)); } private void addRigidBody(BulletRigidBody body, List groups, List filter) { @@ -652,7 +662,8 @@ private void addRigidBody(BulletRigidBody body, List groups, Lis } private void addRigidBody(BulletRigidBody body, short groups, short filter) { - insertionQueue.add(new RigidBodyRequest(body, groups, (short) (filter | btBroadphaseProxy.CollisionFilterGroups.SensorTrigger))); + insertionQueue.add(new RigidBodyRequest(body, groups, + (short) (filter | btBroadphaseProxy.CollisionFilterGroups.SensorTrigger))); } private void removeRigidBody(BulletRigidBody body) { @@ -660,11 +671,9 @@ private void removeRigidBody(BulletRigidBody body) { } /** - * Returns the shape belonging to the given entity. It currently knows 4 - * different shapes: Sphere, Capsule, Cylinder or arbitrary. - * The shape is determined based on the shape component of the given entity. - * If the entity has somehow got multiple shapes, only one is picked. The - * order of priority is: Sphere, Capsule, Cylinder, arbitrary. + * Returns the shape belonging to the given entity. It currently knows 4 different shapes: Sphere, Capsule, Cylinder + * or arbitrary. The shape is determined based on the shape component of the given entity. If the entity has somehow + * got multiple shapes, only one is picked. The order of priority is: Sphere, Capsule, Cylinder, arbitrary. *

* TODO: Flyweight this (take scale as parameter) * @@ -703,14 +712,15 @@ private btCollisionShape getShapeFor(EntityRef entityRef) { return new btConvexHullShape(buffer, numPoints, 3 * Float.BYTES); } CharacterMovementComponent characterMovementComponent = - entityRef.getComponent(CharacterMovementComponent.class); + entityRef.getComponent(CharacterMovementComponent.class); if (characterMovementComponent != null) { - return new btCapsuleShape(characterMovementComponent.pickupRadius, characterMovementComponent.height - 2 * characterMovementComponent.radius); + return new btCapsuleShape(characterMovementComponent.pickupRadius, + characterMovementComponent.height - 2 * characterMovementComponent.radius); } logger.error("Creating physics object that requires a ShapeComponent or CharacterMovementComponent, but has " + - "neither. Entity: {}", entityRef); + "neither. Entity: {}", entityRef); throw new IllegalArgumentException("Creating physics object that requires a ShapeComponent or " + - "CharacterMovementComponent, but has neither. Entity: " + entityRef); + "CharacterMovementComponent, but has neither. Entity: " + entityRef); } private void updateKinematicSettings(RigidBodyComponent rigidBody, BulletRigidBody collider) { @@ -725,7 +735,7 @@ private void updateKinematicSettings(RigidBodyComponent rigidBody, BulletRigidBo private btPairCachingGhostObject createCollider(Vector3f pos, btCollisionShape shape, short groups, short filters, int collisionFlags) { - Matrix4f startTransform = new Matrix4f().translation(pos); + Matrix4f startTransform = new Matrix4f().translation(pos); btPairCachingGhostObject result = new btPairCachingGhostObject(); result.setWorldTransform(startTransform); @@ -790,10 +800,10 @@ private Collection getNewCollisionPairs() manifoldPoint.getNormalWorldOnB(a3); collisionPairs.add(new PhysicsSystem.CollisionPair(entity, otherEntity, - a1, - a2, - manifoldPoint.getDistance(), - a3)); + a1, + a2, + manifoldPoint.getDistance(), + a3)); break; } } @@ -878,12 +888,14 @@ public Matrix4f setWorldTransform(Matrix4f trans) { @Override public Vector3f getLinearVelocity(Vector3f out) { + //TODO: set value on `out` vector return rb.getLinearVelocity(); } @Override public Vector3f getAngularVelocity(Vector3f out) { - return rb.getAngularVelocity();// out; + //TODO: set value on `out` vector + return rb.getAngularVelocity(); } @Override @@ -901,7 +913,8 @@ public void setAngularVelocity(Vector3f value) { @Override public void setOrientation(Quaternionf orientation) { Matrix4f transform = rb.getWorldTransform(); - rb.setWorldTransform(new Matrix4f().translationRotateScale(transform.getTranslation(new Vector3f()), orientation, 1.0f)); + rb.setWorldTransform(new Matrix4f().translationRotateScale(transform.getTranslation(new Vector3f()), + orientation, 1.0f)); } @Override @@ -943,7 +956,7 @@ public void dispose() { } } - private final class BulletCharacterMoverCollider implements CharacterCollider { + private final class BulletCharacterMoverCollider implements CharacterCollider { boolean pending = true; //private final Transform temp = new Transform(); @@ -954,16 +967,19 @@ private final class BulletCharacterMoverCollider implements CharacterCollider { //is allowed to gain direct access to the bullet body: private final btPairCachingGhostObject collider; - private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, List filters, EntityRef owner) { + private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, + List filters, EntityRef owner) { this(pos, shape, groups, filters, 0, owner); } - private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, List filters, int collisionFlags, EntityRef owner) { + private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, List groups, + List filters, int collisionFlags, EntityRef owner) { this(pos, shape, combineGroups(groups), combineGroups(filters), collisionFlags, owner); } - private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, short groups, short filters, int collisionFlags, EntityRef owner) { + private BulletCharacterMoverCollider(Vector3f pos, btConvexShape shape, short groups, short filters, + int collisionFlags, EntityRef owner) { collider = createCollider(pos, shape, groups, filters, collisionFlags); collider.userData = owner; } @@ -981,7 +997,7 @@ public Vector3f getLocation() { @Override public void setLocation(Vector3f loc) { - Matrix4f matrix = collider.getWorldTransform(); + Matrix4f matrix = collider.getWorldTransform(); matrix.setTranslation(loc); collider.setWorldTransform(matrix); } @@ -993,8 +1009,9 @@ public SweepCallback sweep(Vector3f startPos, Vector3f endPos, float allowedPene BulletSweepCallback callback = new BulletSweepCallback(collider, startPos, slopeFactor); callback.setCollisionFilterGroup(collider.getBroadphaseHandle().getCollisionFilterGroup()); callback.setCollisionFilterMask(collider.getBroadphaseHandle().getCollisionFilterMask()); - callback.setCollisionFilterGroup((short)(callback.getCollisionFilterGroup() & (~StandardCollisionGroup.SENSOR.getFlag()))); - collider.convexSweepTest((btConvexShape)(collider.getCollisionShape()), startTransform, endTransform, callback, allowedPenetration); + callback.setCollisionFilterGroup((short) (callback.getCollisionFilterGroup() & (~StandardCollisionGroup.SENSOR.getFlag()))); + collider.convexSweepTest((btConvexShape) (collider.getCollisionShape()), startTransform, endTransform, + callback, allowedPenetration); return callback; } } diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java index 7e5be952b27..4d97daadd57 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/BulletSweepCallback.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet; @@ -131,7 +118,8 @@ public boolean checkForStep(Vector3f direction, float stepHeight, float slopeFac Matrix4f transformFrom = new Matrix4f().setTranslation(fromWorld); Matrix4f transformTo = new Matrix4f().setTranslation(toWorld); Matrix4f targetTransform = this.getHitCollisionObject().getWorldTransform(); - btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); + btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), + this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); if (rayResult.hasHit()) { hitStep = true; Vector3f hitNormal = new Vector3f(); @@ -144,7 +132,8 @@ public boolean checkForStep(Vector3f direction, float stepHeight, float slopeFac transformFrom = new Matrix4f().setTranslation(fromWorld); transformTo = new Matrix4f().setTranslation(toWorld); targetTransform = this.getHitCollisionObject().getWorldTransform(); - btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); + btDiscreteDynamicsWorld.rayTestSingle(transformFrom, transformTo, this.getHitCollisionObject(), + this.getHitCollisionObject().getCollisionShape(), targetTransform, rayResult); if (rayResult.hasHit()) { hitStep = true; Vector3f hitNormal = new Vector3f(); diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java b/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java index e233b0c3433..976a4458c58 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/EntityMotionState.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java index e9eede4affb..f8b2d495bc5 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletBoxShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btBoxShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java index c84282bfd35..5bc795df7de 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java index a8c5b36fc4e..9d8603ca10e 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCollisionShapeFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java index 33c0c425d90..45bf5e81d68 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCompoundShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btCollisionShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java index f13f7b683fc..84c3b757e03 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletConvexHullShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btConvexHullShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java index d139bfb45fc..176af2ec228 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletCylinderShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btCylinderShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java index eedf6078cfc..7f129a2e164 100644 --- a/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/bullet/shapes/BulletSphereShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.bullet.shapes; import com.badlogic.gdx.physics.bullet.collision.btSphereShape; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java index 9d4f953e780..76efd9331be 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/RigidBodyComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components; @@ -27,8 +14,6 @@ import java.util.List; -/** - */ @ForceBlockActive public class RigidBodyComponent implements Component { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java index ded29efb1df..4d4e73ac8de 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/TriggerComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components; @@ -25,8 +12,6 @@ import java.util.List; -/** - */ @ForceBlockActive public class TriggerComponent implements Component { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/physics/components/package-info.java b/engine/src/main/java/org/terasology/engine/physics/components/package-info.java index 6243f441afc..3b1fbd9be85 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.components; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java index 8490a04d308..54c72b960ff 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/BoxShapeComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; -/** - */ public class BoxShapeComponent implements Component { @Replicate public Vector3f extents = new Vector3f(1, 1, 1); diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java index db2394000e5..cc26c384452 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CapsuleShapeComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; -/** - */ public class CapsuleShapeComponent implements Component { public float radius = 0.5f; public float height = 1.0f; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java index cd6a5edc17a..d91b077e4dc 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/CylinderShapeComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; -/** - */ public class CylinderShapeComponent implements Component { public float radius = 0.5f; public float height = 1.0f; diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java index ca438a354a3..43e440c5186 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/HullShapeComponent.java @@ -1,26 +1,11 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; import org.terasology.engine.rendering.assets.mesh.Mesh; -/** - */ public class HullShapeComponent implements Component { public Mesh sourceMesh; } diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java index 9e1e143f9c3..ebdb3bd0c50 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/SphereShapeComponent.java @@ -1,25 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.components.shapes; import org.terasology.engine.entitySystem.Component; -/** - */ public class SphereShapeComponent implements Component { public float radius = 0.5f; } diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java index d6441987f60..5cef5b6c0a3 100644 --- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.components.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java b/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java index 8b9fb907e66..9e3964c8273 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/CharacterCollider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java index ae4fbe9a5dc..4936359a4d6 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngine.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java index 0f5bb95973c..6d7dd82f262 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsEngineManager.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java index 079a4dc73d6..735f0259899 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/PhysicsSystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; import com.google.common.collect.Lists; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java b/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java index 1c078d29aad..f67de124513 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/RigidBody.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java b/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java index c905bb4a08d..44c41cc28b1 100644 --- a/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java +++ b/engine/src/main/java/org/terasology/engine/physics/engine/SweepCallback.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.engine; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java index bae7312cd54..99116b63136 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/BlockImpactEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java index 997fda658c3..fffb9c53b0b 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ChangeVelocityEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class ChangeVelocityEvent implements Event { private Vector3f linearVelocity; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java index 6b059a56fba..17182d589b7 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/CollideEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java index 3d91b43b06a..6cb571b4a30 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/EntityImpactEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java index 6c23a1696c3..7363f58da1b 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ForceEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class ForceEvent implements Event { private Vector3f force; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java index dcb19102225..51ac93e0014 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ImpactEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java index ac764d99c4a..63e697987f0 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/ImpulseEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class ImpulseEvent implements Event { private Vector3f impulse; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java index 33b841b4126..c4183a0afff 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/MovedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java b/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java index adc4c2bdd3c..6603b819db1 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/PhysicsResynchEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.events; @@ -20,8 +7,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.network.BroadcastEvent; -/** - */ @BroadcastEvent public class PhysicsResynchEvent implements Event { private Vector3f velocity = new Vector3f(); diff --git a/engine/src/main/java/org/terasology/engine/physics/events/package-info.java b/engine/src/main/java/org/terasology/engine/physics/events/package-info.java index b698739d0e1..69557910a90 100644 --- a/engine/src/main/java/org/terasology/engine/physics/events/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/events/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.events; diff --git a/engine/src/main/java/org/terasology/engine/physics/package-info.java b/engine/src/main/java/org/terasology/engine/physics/package-info.java index 6f720b194f0..3d2b1166223 100644 --- a/engine/src/main/java/org/terasology/engine/physics/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 /** * This package provides physics support for Terasology - diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java index 827d30f22fa..b75f53e2c80 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/BoxShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java index 1e29c4c3d75..4601bc3631c 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; import org.terasology.joml.geom.AABBf; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java index e3248aed365..7a1de661af8 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/CollisionShapeFactory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java index 014d18c302f..70040e90e59 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/CompoundShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; import org.joml.Quaternionfc; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java index 6b18519451a..718495e1ce2 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/ConvexHullShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java b/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java index 417553e2bf5..02b95ef5721 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/SphereShape.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.physics.shapes; /** diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java index 1ec5923920b..dbfde465b58 100644 --- a/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java +++ b/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.physics.shapes; diff --git a/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java b/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java index 9e57e3d315e..46a7c74c48d 100644 --- a/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java +++ b/engine/src/main/java/org/terasology/engine/recording/CharacterStateEventPositionMap.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.joml.Vector3f; diff --git a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java index ed763e20302..bab7a16deee 100644 --- a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java +++ b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorder.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; diff --git a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java index 7b2b554f7b2..9f59e53df3a 100644 --- a/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java +++ b/engine/src/main/java/org/terasology/engine/recording/DirectionAndOriginPosRecorderList.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import java.util.ArrayList; diff --git a/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java b/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java index c1790bafa04..8d767a6f20c 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventCatcher.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.terasology.engine.entitySystem.event.Event; diff --git a/engine/src/main/java/org/terasology/engine/recording/EventCopier.java b/engine/src/main/java/org/terasology/engine/recording/EventCopier.java index d32c789d94d..d7e8610d6eb 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventCopier.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventCopier.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.slf4j.Logger; diff --git a/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java b/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java index 8fc3f7b5fa8..33e39242d62 100644 --- a/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java +++ b/engine/src/main/java/org/terasology/engine/recording/EventSystemReplayImpl.java @@ -328,8 +328,9 @@ public void registerEventHandler(ComponentSystem handler) { componentParams.add((Class) types[i]); } - EventSystemReplayImpl.ByteCodeEventHandlerInfo handlerInfo = new EventSystemReplayImpl.ByteCodeEventHandlerInfo(handler, method, receiveEventAnnotation.priority(), - receiveEventAnnotation.activity(), requiredComponents, componentParams); + EventSystemReplayImpl.ByteCodeEventHandlerInfo handlerInfo = + new EventSystemReplayImpl.ByteCodeEventHandlerInfo(handler, method, receiveEventAnnotation.priority(), + receiveEventAnnotation.activity(), requiredComponents, componentParams); addEventHandler((Class) types[0], handlerInfo, requiredComponents); } } diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java index b9a53a9bca7..b6b52f5d50b 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayCurrentStatus.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; /** diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java index 0bc82aee77a..d182d028d83 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayStatus.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; /** diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java index 9f1b597624c..5519a8a6f1b 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordAndReplayUtils.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; /** diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java index 5aa4a8a121c..0c953434790 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEntityRef.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java index b39a28bcc3e..490ccdafd0e 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEvent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java index 4feb6f80688..9137f0002f0 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEventSerializer.java @@ -71,7 +71,7 @@ public List deserializeRecordedEvents(String filePath) { try (FileInputStream fileInputStream = new FileInputStream(filePath)) { List recordedEvents = - serializer.deserialize(new TypeInfo>() {}, fileInputStream).get(); + serializer.deserialize(new TypeInfo>() { }, fileInputStream).get(); events.addAll(recordedEvents); } catch (SerializationException | IOException e) { logger.error("Error while serializing recorded events", e); diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java b/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java index d539f44648f..be224686b78 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordedEventStore.java @@ -1,18 +1,5 @@ -/* - * Copyright 2018 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; import java.util.ArrayList; diff --git a/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java b/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java index 2908720916f..a90a977065c 100644 --- a/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java +++ b/engine/src/main/java/org/terasology/engine/recording/RecordingEventSystemDecorator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.recording; diff --git a/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java b/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java index 0ebb53b3218..becf2bcc6c5 100644 --- a/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java +++ b/engine/src/main/java/org/terasology/engine/reflection/reflect/ByteCodeReflectFactory.java @@ -24,8 +24,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; -/** - */ public class ByteCodeReflectFactory implements ReflectFactory { private static final Logger logger = LoggerFactory.getLogger(ByteCodeReflectFactory.class); diff --git a/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java b/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java index 77555b8a4ce..4cc4cedd703 100644 --- a/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java +++ b/engine/src/main/java/org/terasology/engine/registry/CoreRegistry.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; import org.terasology.engine.context.Context; diff --git a/engine/src/main/java/org/terasology/engine/registry/In.java b/engine/src/main/java/org/terasology/engine/registry/In.java index 0a958eb829c..23297581ae6 100644 --- a/engine/src/main/java/org/terasology/engine/registry/In.java +++ b/engine/src/main/java/org/terasology/engine/registry/In.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; diff --git a/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java b/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java index f79d7abcc74..4715e9a3cab 100644 --- a/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java +++ b/engine/src/main/java/org/terasology/engine/registry/InjectionHelper.java @@ -17,8 +17,6 @@ import java.util.NoSuchElementException; import java.util.Optional; -/** - */ public final class InjectionHelper { private static final Logger logger = LoggerFactory.getLogger(InjectionHelper.class); diff --git a/engine/src/main/java/org/terasology/engine/registry/Share.java b/engine/src/main/java/org/terasology/engine/registry/Share.java index e2cf5aba843..fe32b0d510c 100644 --- a/engine/src/main/java/org/terasology/engine/registry/Share.java +++ b/engine/src/main/java/org/terasology/engine/registry/Share.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.registry; diff --git a/engine/src/main/java/org/terasology/engine/registry/package-info.java b/engine/src/main/java/org/terasology/engine/registry/package-info.java index f2df01300b0..78935b3b4c4 100644 --- a/engine/src/main/java/org/terasology/engine/registry/package-info.java +++ b/engine/src/main/java/org/terasology/engine/registry/package-info.java @@ -1,18 +1,5 @@ -/* - * Copyright 2014 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 @API package org.terasology.engine.registry; diff --git a/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java index 7e32dde4df3..7c51ebb17f7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/BlockOverlayRenderer.java @@ -5,8 +5,6 @@ import org.terasology.joml.geom.AABBfc; -/** - */ public interface BlockOverlayRenderer { void setAABB(AABBfc aabb); diff --git a/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java b/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java index 4c932737cc1..81dc0ca5d82 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java +++ b/engine/src/main/java/org/terasology/engine/rendering/RenderHelper.java @@ -6,8 +6,6 @@ import org.joml.Vector3fc; import org.terasology.engine.rendering.dag.nodes.RefractiveReflectiveBlocksNodeProxy; -/** - */ public final class RenderHelper { // Parameters which are also defined on shader side diff --git a/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java b/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java index dae91326701..8408ec019b2 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java +++ b/engine/src/main/java/org/terasology/engine/rendering/RenderMath.java @@ -4,8 +4,6 @@ import org.terasology.math.TeraMath; -/** - */ public final class RenderMath { private RenderMath() { } diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java index 7c1eb9947d4..5bbdfe7f65f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimation.java @@ -9,8 +9,6 @@ import org.terasology.engine.rendering.assets.skeletalmesh.SkeletalMesh; import org.terasology.joml.geom.AABBf; -/** - */ public abstract class MeshAnimation extends Asset { protected MeshAnimation(ResourceUrn urn, AssetType assetType) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java index 14580871855..38573d71ef7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationData.java @@ -10,8 +10,6 @@ import java.util.List; -/** - */ public class MeshAnimationData implements AssetData { public static final int NO_PARENT = -1; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java index 7e9673ae592..27daa206b8f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationFrame.java @@ -9,8 +9,6 @@ import java.util.List; -/** - */ public class MeshAnimationFrame { private List bonePositions; private List boneRotations; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java index d132a7a3089..9783c994a7b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/MeshAnimationImpl.java @@ -11,8 +11,6 @@ import java.util.Optional; -/** - */ public class MeshAnimationImpl extends MeshAnimation { private MeshAnimationData data; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java index ef962eee75f..109e29e8f95 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AltasTileProducer.java @@ -12,8 +12,6 @@ import java.util.Optional; import java.util.Set; -/** - */ @RegisterAssetDataProducer public class AltasTileProducer extends AbstractFragmentDataProducer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java index b0ffa85dd4e..272e58786c5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/Atlas.java @@ -12,8 +12,6 @@ import java.util.Map; import java.util.Optional; -/** - */ public class Atlas extends Asset { private Map subtextures = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java index 14c2c9ab979..606c85eb982 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasData.java @@ -8,8 +8,6 @@ import java.util.Map; -/** - */ public class AtlasData implements AssetData { private Map subtextures; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java index 1ca49606059..90941eacec6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasDefinition.java @@ -6,8 +6,6 @@ import java.util.List; -/** - */ public class AtlasDefinition { private String texture; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java index 2e0990e8098..867af9790ee 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/AtlasFormat.java @@ -29,8 +29,6 @@ import java.util.Map; import java.util.Optional; -/** - */ @RegisterAssetFileFormat public class AtlasFormat extends AbstractAssetFileFormat { public static final float BORDER_SIZE = 0.0001f; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java index 3db6d0a1405..c8232a6a471 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/FreeformDefinition.java @@ -5,8 +5,6 @@ import org.joml.Vector2i; -/** - */ public class FreeformDefinition { private String name; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java index 0ac72a25c19..d651a42d7c7 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/atlas/GridDefinition.java @@ -7,8 +7,6 @@ import java.util.List; -/** - */ public class GridDefinition { private Vector2i tileSize; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java index 297bacbb1b6..3ffaddd12fc 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/Font.java @@ -10,8 +10,6 @@ import java.util.List; -/** - */ public abstract class Font extends Asset implements org.terasology.nui.asset.font.Font { protected Font(ResourceUrn urn, AssetType assetType) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java index 60ad26bd01f..9ae9222b4b6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontCharacter.java @@ -6,8 +6,6 @@ import org.terasology.engine.rendering.assets.material.Material; import org.terasology.engine.rendering.assets.texture.Texture; -/** - */ public class FontCharacter { private float x; private float y; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java index 6a78048bd97..17fe0b9827d 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontData.java @@ -7,8 +7,6 @@ import java.util.Map; -/** - */ public class FontData implements AssetData { private int lineHeight; private int baseHeight; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java index efd5640570e..964692822c6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontDataBuilder.java @@ -10,8 +10,6 @@ import java.util.Map; -/** - */ public class FontDataBuilder { private int lineHeight; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java index 731fcc66760..d202d75390b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontFormat.java @@ -21,8 +21,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -/** - */ @RegisterAssetFileFormat public class FontFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java index dd69808a2f7..b975ff26df1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/FontMaterialProducer.java @@ -18,8 +18,6 @@ import java.util.Optional; import java.util.Set; -/** - */ @RegisterAssetDataProducer public class FontMaterialProducer implements AssetDataProducer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java index 4de5e88b4d5..51acb7faede 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/Material.java @@ -18,8 +18,6 @@ import java.nio.FloatBuffer; -/** - */ public abstract class Material extends Asset { protected Material(ResourceUrn urn, AssetType assetType, DisposableResource resource) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java index b142e2227d5..e3b3def3c7b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialData.java @@ -11,8 +11,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -/** - */ public class MaterialData implements AssetData { private Shader shader; private Map textures = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java index 301590127fc..c108397f32a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/MaterialFormat.java @@ -28,8 +28,6 @@ import java.util.Map; import java.util.Optional; -/** - */ @RegisterAssetFileFormat public class MaterialFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java index e5775e14d5f..e9deff83bdd 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshData.java @@ -14,8 +14,6 @@ import java.util.ArrayList; import java.util.List; -/** - */ public abstract class MeshData implements AssetData { public enum DrawingMode { POINTS(GL30.GL_POINT), diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java index 95482f4b2ed..a485447b908 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/GLSLShaderFormat.java @@ -23,12 +23,9 @@ import java.io.InputStreamReader; import java.io.Reader; import java.lang.reflect.Type; -import java.nio.file.PathMatcher; import java.util.List; import java.util.function.Predicate; -/** - */ @RegisterAssetFileFormat public class GLSLShaderFormat implements AssetFileFormat { public static final String FRAGMENT_SUFFIX = "_frag.glsl"; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java index 26f526193ef..33e5f614c35 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/Shader.java @@ -8,8 +8,6 @@ import org.terasology.gestalt.assets.DisposableResource; import org.terasology.gestalt.assets.ResourceUrn; -/** - */ public abstract class Shader extends Asset { protected Shader(ResourceUrn urn, AssetType assetType, DisposableResource resource) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java index 4e76d95d378..4d8c9d4a5d1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderData.java @@ -9,8 +9,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -/** - */ public class ShaderData implements AssetData { private static final String DEFAULT_VERSION = "120"; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java index 6e827b7a17b..056595dacfb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderMetadata.java @@ -7,8 +7,6 @@ import java.util.List; -/** - */ public class ShaderMetadata { List parameters = Lists.newArrayList(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java index 05fd5492a02..17595c6876e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/ShaderParameterMetadata.java @@ -3,8 +3,6 @@ package org.terasology.engine.rendering.assets.shader; -/** - */ public class ShaderParameterMetadata { String name; ParamType type; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java index d90e7c014d0..0167be7ad94 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/Bone.java @@ -11,8 +11,6 @@ import java.util.Collection; import java.util.List; -/** - */ public class Bone { private String name; private int index; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java index 17ae4fe114b..ba1f1196c75 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/BoneWeight.java @@ -7,8 +7,6 @@ import gnu.trove.list.TFloatList; import gnu.trove.list.TIntList; -/** - */ public class BoneWeight { private float[] biases; private int[] boneIndices; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java index 61cbce3fbdf..9a742530f04 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMesh.java @@ -11,8 +11,6 @@ import java.util.Collection; -/** - */ public abstract class SkeletalMesh extends Asset { protected SkeletalMesh(ResourceUrn urn, AssetType assetType, DisposableResource disposableResource) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java index 2059235d71e..f8dbb2c7463 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshData.java @@ -18,9 +18,7 @@ import java.util.List; import java.util.Map; -/** - * - */ + public class SkeletalMeshData implements AssetData { private Bone rootBone; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java index 01cb7a6177d..88127b9c061 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/SkeletalMeshDataBuilder.java @@ -10,14 +10,11 @@ import org.terasology.engine.rendering.assets.mesh.StandardMeshData; import org.terasology.joml.geom.AABBf; import org.terasology.engine.rendering.assets.mesh.MeshBuilder; -import org.terasology.engine.rendering.assets.mesh.MeshData; import java.util.ArrayList; import java.util.List; -/** - * - */ + public class SkeletalMeshDataBuilder { private List bones = new ArrayList<>(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java index 9b32a70118a..4e59beda55f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/AWTTextureFormat.java @@ -22,8 +22,6 @@ import static org.terasology.gestalt.assets.module.ModuleAssetScanner.OVERRIDE_FOLDER; -/** - */ @RegisterAssetFileFormat public class AWTTextureFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java index 1b7e792f27b..7a6ae33f7ab 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/BasicTextureRegion.java @@ -9,8 +9,6 @@ import org.terasology.joml.geom.Rectanglei; import org.terasology.math.TeraMath; -/** - */ public class BasicTextureRegion implements TextureRegion { private Texture texture; private Rectanglef region = new Rectanglef(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java index e2a11ba5595..c34d079c082 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/PNGTextureFormat.java @@ -12,12 +12,9 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; -import java.nio.file.PathMatcher; import java.util.List; import java.util.function.Predicate; -/** - */ public class PNGTextureFormat extends AbstractAssetFileFormat { private Texture.FilterMode defaultFilterMode; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java index 42f2f17601c..d7516da9d83 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureData.java @@ -8,8 +8,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; -/** - */ public class TextureData implements AssetData { private static final int BYTES_PER_PIXEL = 4; diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java index 0dc89dacf95..2d586758e9e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureInfoFormat.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStreamReader; -/** - */ @RegisterAssetSupplementalFileFormat public class TextureInfoFormat extends AbstractAssetAlterationFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java index da77ad32c76..ab9588f27fe 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/TextureRegionAsset.java @@ -8,8 +8,6 @@ import org.terasology.gestalt.assets.DisposableResource; import org.terasology.gestalt.assets.ResourceUrn; -/** - */ public abstract class TextureRegionAsset extends Asset implements TextureRegion { protected TextureRegionAsset(ResourceUrn urn, AssetType assetType) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java index ef21f526698..35ac621989f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/Subtexture.java @@ -15,8 +15,6 @@ import java.util.Optional; -/** - */ public class Subtexture extends TextureRegionAsset { private Texture texture; @@ -58,7 +56,7 @@ public Rectanglef getRegion() { public Rectanglei getPixelRegion() { return new Rectanglei( TeraMath.floorToInt(subregion.minX() * texture.getWidth()), - TeraMath.floorToInt(subregion.minY() * texture.getHeight())).setSize( getWidth(), getHeight()); + TeraMath.floorToInt(subregion.minY() * texture.getHeight())).setSize(getWidth(), getHeight()); } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java index 9f49e564436..92441da9bc9 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java +++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/SubtextureData.java @@ -6,8 +6,6 @@ import org.terasology.joml.geom.Rectanglef; import org.terasology.engine.rendering.assets.texture.Texture; -/** - */ public class SubtextureData implements AssetData { private Texture texture; private Rectanglef region; diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java b/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java index db018f58552..01b50529b7a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/AbstractNode.java @@ -205,14 +205,15 @@ public boolean addOutputBufferPairConnection(int id, BufferPair bufferPair) { logger.debug("data propagated.\n"); } - if(localBufferPairConnection.getData() != null) { + if (localBufferPairConnection.getData() != null) { logger.warn("Adding output buffer pair to slot id " + id + " of " + this.nodeUri + "node overwrites data of existing connection: " + localBufferPairConnection.toString()); } localBufferPairConnection.setData(bufferPair); success = true; } else { - DependencyConnection localBufferPairConnection = new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, bufferPair, this.getUri()); + DependencyConnection localBufferPairConnection = + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, bufferPair, this.getUri()); success = addOutputConnection(localBufferPairConnection); } return success; @@ -240,7 +241,7 @@ public boolean addOutputBufferPairConnection(int id, BufferPairConnection from) logger.info("data propagated.\n"); } - if(localBufferPairConnection.getData() != null) { + if (localBufferPairConnection.getData() != null) { logger.warn("Adding output buffer pair connection " + from.toString() + "\n to slot id " + id + " of " + this.nodeUri + "node overwrites data of existing connection: " + localBufferPairConnection.toString()); } @@ -248,14 +249,16 @@ public boolean addOutputBufferPairConnection(int id, BufferPairConnection from) success = true; } else { - DependencyConnection localBufferPairConnection = new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, from.getData(), this.getUri()); + DependencyConnection localBufferPairConnection = + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, from.getData(), this.getUri()); success = addOutputConnection(localBufferPairConnection); } return success; } public boolean addOutputBufferPairConnection(int id) { - DependencyConnection localBufferPairConnection = new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); + DependencyConnection localBufferPairConnection = + new BufferPairConnection(BufferPairConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); return addOutputConnection(localBufferPairConnection); } @@ -266,7 +269,8 @@ public boolean addOutputBufferPairConnection(int id) { * @return true if inserted, false otherwise */ protected boolean addInputFboConnection(int id, FboConnection from) { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, from.getData(), this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, from.getData(), this.getUri()); fboConnection.setConnectedConnection(from); // must remember where I'm connected from return addInputConnection(fboConnection); } @@ -278,7 +282,8 @@ protected boolean addInputFboConnection(int id, FboConnection from) { * @return true if inserted, false otherwise */ public boolean addInputFboConnection(int id, FBO fboData) { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, fboData, this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.INPUT, fboData, this.getUri()); return addInputConnection(fboConnection); } @@ -294,7 +299,7 @@ protected boolean addOutputFboConnection(int id, FBO fboData) { if (outputConnections.containsKey(connectionUri)) { FboConnection fboConnection = (FboConnection) outputConnections.get(connectionUri); - if(fboConnection.getData() != null) { + if (fboConnection.getData() != null) { logger.warn("Adding output fbo data to slot id " + id + " of " + this.nodeUri + "node overwrites data of existing connection: " + fboConnection.toString()); } @@ -312,14 +317,16 @@ protected boolean addOutputFboConnection(int id, FBO fboData) { success = true; } else { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, fboData, this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, fboData, this.getUri()); success = addOutputConnection(fboConnection); } return success; } public boolean addOutputFboConnection(int id) { - DependencyConnection fboConnection = new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); + DependencyConnection fboConnection = + new FboConnection(FboConnection.getConnectionName(id, this.nodeUri), DependencyConnection.Type.OUTPUT, this.getUri()); return addOutputConnection(fboConnection); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java index f675e73cf3e..c41558a2453 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/RunOrderConnection.java @@ -6,9 +6,7 @@ // TODO examine if we really need this connection type -/** - * - */ + public class RunOrderConnection extends DependencyConnection { public RunOrderConnection(String name, Type type, SimpleUri parentNode) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java index d7b90fbebef..50c56b85e16 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java +++ b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/SetFboWriteMask.java @@ -3,18 +3,18 @@ package org.terasology.engine.rendering.dag.stateChanges; import com.google.common.base.Objects; -import org.terasology.engine.rendering.opengl.FBO; import org.terasology.engine.rendering.dag.StateChange; +import org.terasology.engine.rendering.opengl.FBO; /** * Sets an FBO's write mask. - * + *

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

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

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

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

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

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

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

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

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

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

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

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

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

+ * See glTF Specification - sparse for details. */ public class GLTFSparse { diff --git a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java index da385608481..719158341b2 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshDataProducer.java @@ -19,8 +19,6 @@ import java.util.Optional; import java.util.Set; -/** - */ @RegisterAssetDataProducer public class IconMeshDataProducer implements AssetDataProducer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java index 7e99eb20265..f52c8f8c170 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/AnimEndEvent.java @@ -6,8 +6,6 @@ import org.terasology.engine.entitySystem.event.Event; import org.terasology.engine.rendering.assets.animation.MeshAnimation; -/** - */ public class AnimEndEvent implements Event { private MeshAnimation animation; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java index da52b658aaf..8248dfc0c72 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/ChunkMeshComponent.java @@ -19,7 +19,7 @@ public class ChunkMeshComponent implements VisualComponent { @Replicate public boolean animated = true; - public ChunkMeshComponent() {} + public ChunkMeshComponent() { } public ChunkMeshComponent(ChunkMesh mesh, AABBf aabb) { this.mesh = mesh; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java index e8e17cc8b2b..288d35b8398 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/FloatingTextRenderer.java @@ -3,7 +3,6 @@ package org.terasology.engine.rendering.logic; import com.google.common.collect.Maps; -import org.joml.Matrix3f; import org.joml.Matrix4f; import org.joml.Vector3f; import org.joml.Vector3fc; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java index a1569321275..a949e41b563 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeComponent.java @@ -4,8 +4,6 @@ import org.terasology.engine.network.Replicate; -/** - */ public final class LightFadeComponent implements VisualComponent { @Replicate diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java index f09a67496a9..079a55e2f17 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/LightFadeSystem.java @@ -12,8 +12,6 @@ import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.registry.In; -/** - */ @RegisterSystem public class LightFadeSystem extends BaseComponentSystem implements UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java index 381726763e7..959d8b30a13 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/MeshComponent.java @@ -8,8 +8,6 @@ import org.terasology.engine.rendering.assets.mesh.Mesh; import org.terasology.engine.world.block.ForceBlockActive; -/** - */ @ForceBlockActive public final class MeshComponent implements VisualComponent { diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java index fb048af4b45..500fc25c833 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletalMeshComponent.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.Map; -/** - */ @ForceBlockActive public class SkeletalMeshComponent implements VisualComponent { public SkeletalMesh mesh; diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java index 8dedc0b5f8f..046b0329a95 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/logic/SkeletonRenderer.java @@ -49,8 +49,6 @@ import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glVertex3f; -/** - */ @RegisterSystem(RegisterMode.CLIENT) public class SkeletonRenderer extends BaseComponentSystem implements RenderSystem, UpdateSubscriberSystem { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java b/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java index 43c4be1e080..c1c8728a1ec 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/NUIManager.java @@ -14,8 +14,6 @@ import java.util.Deque; -/** - */ public interface NUIManager extends ComponentSystem, FocusManager { HUDScreenLayer getHUD(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java index 8d3d9f1406f..7bcf27baa9e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/UIScreenLayer.java @@ -4,8 +4,6 @@ import org.terasology.nui.ControlWidget; -/** - */ public interface UIScreenLayer extends ControlWidget { boolean isLowerLayerVisible(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java index b7c4b7a597a..11631528276 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/layers/AbstractEditorScreen.java @@ -354,7 +354,7 @@ protected Path getPath(AssetDataFile source) { String[] more = Arrays.copyOfRange(pathArray, 1, pathArray.length); return Paths.get("", moduleManager.getEnvironment().getResources() .getFile(first, more) - .orElseThrow(()-> new RuntimeException("Cannot get path for "+source.getFilename())).getPath().stream().toArray(String[]::new)); + .orElseThrow(()-> new RuntimeException("Cannot get path for " + source.getFilename())).getPath().stream().toArray(String[]::new)); } return null; } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java index ab8a326dce8..86a7a886eb5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/utils/NUIEditorNodeUtils.java @@ -29,8 +29,8 @@ @SuppressWarnings("unchecked") public final class NUIEditorNodeUtils { private static final String SAMPLE_LABEL_TEXT = "Welcome to the Terasology NUI editor!\r\n" + - "Visit https://github.com/Terasology/TutorialNui/wiki for a quick overview of the editor,\r\n" + - "as well as the NUI framework itself."; + "Visit https://github.com/Terasology/TutorialNui/wiki for a quick overview of the editor,\r\n" + + "as well as the NUI framework itself."; private NUIEditorNodeUtils() { } @@ -69,10 +69,11 @@ public static JsonTree createNewSkin() { } /** - * @param type The type of the widget. - * @param id The id of the widget. + * @param type The type of the widget. + * @param id The id of the widget. * @param addLayoutInfo Whether a few layout settings from {@link RelativeLayout} should be added. - * @return The {@link JsonTree} with the given type/id to be used as an empty widget template within {@link NUIEditorScreen}. + * @return The {@link JsonTree} with the given type/id to be used as an empty widget template within {@link + * NUIEditorScreen}. */ public static JsonTree createNewWidget(String type, String id, boolean addLayoutInfo) { JsonTree widget = new JsonTree(new JsonTreeValue(null, null, JsonTreeValue.Type.OBJECT)); @@ -85,9 +86,9 @@ public static JsonTree createNewWidget(String type, String id, boolean addLayout layoutInfo.addChild(new JsonTreeValue("width", 500, JsonTreeValue.Type.KEY_VALUE_PAIR)); JsonTree hPosition = new JsonTree(new JsonTreeValue("position-horizontal-center", null, JsonTreeValue.Type - .OBJECT)); + .OBJECT)); JsonTree vPosition = new JsonTree(new JsonTreeValue("position-vertical-center", null, JsonTreeValue.Type - .OBJECT)); + .OBJECT)); layoutInfo.addChild(hPosition); layoutInfo.addChild(vPosition); @@ -111,7 +112,7 @@ private static Deque getPathToRoot(JsonTree node) { } /** - * @param node A node in an asset tree. + * @param node A node in an asset tree. * @param nuiManager The {@link NUIManager} to be used for widget type resolution. * @return The info about this node's type. */ @@ -123,7 +124,8 @@ public static NodeInfo getNodeInfo(JsonTree node, NUIManager nuiManager) { Class activeLayoutClass = null; Function> resolve = (String type) -> - verifyNotNull(nuiManager.getWidgetMetadataLibrary().resolve(type, ModuleContext.getContext()), "Failed to resolve widget %s in %s", type, ModuleContext.getContext()) + verifyNotNull(nuiManager.getWidgetMetadataLibrary().resolve(type, ModuleContext.getContext()), + "Failed to resolve widget %s in %s", type, ModuleContext.getContext()) .getType(); for (JsonTree n : pathToRoot) { @@ -133,8 +135,8 @@ public static NodeInfo getNodeInfo(JsonTree node, NUIManager nuiManager) { currentClass = resolve.apply(type); } else { if (List.class.isAssignableFrom(currentClass) - && n.getValue().getKey() == null - && "contents".equals(n.getParent().getValue().getKey())) { + && n.getValue().getKey() == null + && "contents".equals(n.getParent().getValue().getKey())) { // Transition from a "contents" list to a UIWidget. currentClass = UIWidget.class; } else { @@ -155,20 +157,21 @@ public static NodeInfo getNodeInfo(JsonTree node, NUIManager nuiManager) { currentClass = List.class; } else if (UIWidget.class.isAssignableFrom(currentClass) && "layoutInfo".equals(n.getValue().getKey())) { // Set currentClass to the layout hint type for the active layout. - currentClass = (Class) ReflectionUtil.getTypeParameter(activeLayoutClass.getGenericSuperclass(), 0); + currentClass = + (Class) ReflectionUtil.getTypeParameter(activeLayoutClass.getGenericSuperclass(), 0); } else { String value = n.getValue().toString(); Set fields = ReflectionUtils.getAllFields(currentClass); Optional newField = fields - .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); + .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); if (newField.isPresent()) { currentClass = newField.get().getType(); } else { Optional serializedNameField = fields - .stream() - .filter(f -> f.isAnnotationPresent(SerializedName.class) - && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); + .stream() + .filter(f -> f.isAnnotationPresent(SerializedName.class) + && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); if (serializedNameField.isPresent()) { currentClass = serializedNameField.get().getType(); } else { @@ -209,22 +212,22 @@ public static NodeInfo getSkinNodeInfo(JsonTree node) { if ("elements".equals(n.getValue().getKey()) || "families".equals(n.getValue().getKey())) { nodeClass = null; } else if (n.getParent().getValue().getKey() != null - && ("elements".equals(n.getParent().getValue().getKey()) - || "families".equals(n.getParent().getValue().getKey()))) { + && ("elements".equals(n.getParent().getValue().getKey()) + || "families".equals(n.getParent().getValue().getKey()))) { nodeClass = UIStyleFragment.class; } else { String value = n.getValue().toString(); Set fields = ReflectionUtils.getAllFields(nodeClass); Optional newField = fields - .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); + .stream().filter(f -> f.getName().equalsIgnoreCase(value)).findFirst(); if (newField.isPresent()) { nodeClass = newField.get().getType(); } else { Optional serializedNameField = fields - .stream() - .filter(f -> f.isAnnotationPresent(SerializedName.class) - && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); + .stream() + .filter(f -> f.isAnnotationPresent(SerializedName.class) + && f.getAnnotation(SerializedName.class).value().equals(value)).findFirst(); if (serializedNameField.isPresent()) { nodeClass = serializedNameField.get().getType(); } else { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java index 63ed07c04fb..463d3049b7c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LineRenderer.java @@ -9,9 +9,7 @@ import java.nio.FloatBuffer; -/** - * - */ + public final class LineRenderer { private LineRenderer() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java index 6b77906d353..9809a6d30a9 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/LwjglCanvasRenderer.java @@ -16,7 +16,6 @@ import org.joml.Vector3f; import org.joml.Vector3fc; import org.lwjgl.opengl.GL11; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.config.Config; import org.terasology.engine.config.RenderingConfig; import org.terasology.engine.context.Context; @@ -29,6 +28,7 @@ import org.terasology.engine.rendering.opengl.FrameBufferObject; import org.terasology.engine.rendering.opengl.LwjglFrameBufferObject; import org.terasology.engine.utilities.Assets; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.joml.geom.AABBfc; import org.terasology.joml.geom.Rectanglef; @@ -97,7 +97,8 @@ public LwjglCanvasRenderer(Context context) { // engine tries to load; the build is probably broken. () -> new RuntimeException("Failing to find engine textures")); this.billboard = Assets.getMesh("engine:UIBillboard").get(); - this.fontMeshBuilder = new FontMeshBuilder(context.get(AssetManager.class).getAsset("engine:UIUnderline", Material.class).get()); + this.fontMeshBuilder = new FontMeshBuilder(context.get(AssetManager.class).getAsset("engine:UIUnderline", + Material.class).get()); // failure to load these can be due to failing shaders or missing resources this.renderingConfig = context.get(Config.class).getRendering(); @@ -116,12 +117,12 @@ public void preRender() { // TODO: figure out previous call to viewport scaling is handled // changing resolution scaling affect viewport of LWJGLCanvas causing strange scaling artifact. glViewport(0, 0, displayDevice.getWidth(), displayDevice.getHeight()); - projMatrix.setOrtho(0, displayDevice.getWidth(), displayDevice.getHeight(),0,0, 2048f); + projMatrix.setOrtho(0, displayDevice.getWidth(), displayDevice.getHeight(), 0, 0, 2048f); modelMatrixStack.pushMatrix(); - modelMatrixStack.set(new Matrix4f().setTranslation(0,0,-1024)); + modelMatrixStack.set(new Matrix4f().setTranslation(0, 0, -1024)); modelMatrixStack.scale(uiScale, uiScale, uiScale); - requestedCropRegion = new Rectanglei(0, 0,displayDevice.getWidth(), displayDevice.getHeight()); + requestedCropRegion = new Rectanglei(0, 0, displayDevice.getWidth(), displayDevice.getHeight()); currentTextureCropRegion = requestedCropRegion; textureMat.setFloat4(CROPPING_BOUNDARIES_PARAM, requestedCropRegion.minX, requestedCropRegion.maxX, requestedCropRegion.minY, requestedCropRegion.maxY); @@ -155,19 +156,21 @@ public void postRender() { } @Override - public void drawMesh(Mesh mesh, Material material, Rectanglei drawRegion, Rectanglei cropRegion, Quaternionfc rotation, Vector3fc offset, float scale, float alpha) { + public void drawMesh(Mesh mesh, Material material, Rectanglei drawRegion, Rectanglei cropRegion, + Quaternionfc rotation, Vector3fc offset, float scale, float alpha) { if (!material.isRenderable()) { return; } AABBfc meshAABB = mesh.getAABB(); Vector3f meshExtents = meshAABB.extent(new Vector3f()); - float fitScale = 0.35f * Math.min(drawRegion.getSizeX(), drawRegion.getSizeY()) / Math.max(meshExtents.x, Math.max(meshExtents.y, meshExtents.z)); + float fitScale = 0.35f * Math.min(drawRegion.getSizeX(), drawRegion.getSizeY()) / Math.max(meshExtents.x, + Math.max(meshExtents.y, meshExtents.z)); Vector3f centerOffset = meshAABB.center(new Vector3f()); centerOffset.mul(-1.0f); - Matrix4f centerTransform = new Matrix4f().translationRotateScale(centerOffset,new Quaternionf(),1); - Matrix4f userTransform = new Matrix4f().translationRotateScale( offset,rotation, -fitScale * scale); + Matrix4f centerTransform = new Matrix4f().translationRotateScale(centerOffset, new Quaternionf(), 1); + Matrix4f userTransform = new Matrix4f().translationRotateScale(offset, rotation, -fitScale * scale); Matrix4f translateTransform = new Matrix4f().translationRotateScale( new Vector3f((drawRegion.minX + drawRegion.getSizeX() / 2) * uiScale, (drawRegion.minY + drawRegion.getSizeY() / 2) * uiScale, 0), new Quaternionf(), 1); @@ -252,7 +255,7 @@ public FrameBufferObject getFBO(ResourceUrn urn, Vector2ic size) { @Override public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, Rectanglei absoluteRegionRectangle, float ux, float uy, float uw, float uh, float alpha) { - if (!((TextureRegion)texture).getTexture().isLoaded()) { + if (!((TextureRegion) texture).getTexture().isLoaded()) { return; } @@ -271,7 +274,8 @@ public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, R switch (mode) { case TILED: { Vector2i textureSize = texture.size(); - TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(absoluteRegion.getSizeX(),absoluteRegion.getSizeY())); + TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(absoluteRegion.getSizeX(), + absoluteRegion.getSizeY())); usedTextures.add(key); mesh = cachedTextures.get(key); if (mesh == null || mesh.isDisposed()) { @@ -285,7 +289,8 @@ public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, R absoluteRegion.minX, absoluteRegion.minY); - textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), textureArea.minY + uy * textureArea.getSizeY()); + textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), + textureArea.minY + uy * textureArea.getSizeY()); textureMat.setFloat2("texSize", uw * textureArea.getSizeX(), uh * textureArea.getSizeY()); break; } @@ -298,7 +303,8 @@ public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, R textureMat.setFloat2("texOffset", textureArea.minX + (ux + 0.5f * texBorderX) * textureArea.getSizeX(), textureArea.minY + (uy + 0.5f * texBorderY) * textureArea.getSizeY()); - textureMat.setFloat2("texSize", (uw - texBorderX) * textureArea.getSizeX(), (uh - texBorderY) * textureArea.getSizeY()); + textureMat.setFloat2("texSize", (uw - texBorderX) * textureArea.getSizeX(), + (uh - texBorderY) * textureArea.getSizeY()); break; } default: { @@ -307,13 +313,14 @@ public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, R absoluteRegion.minX + 0.5f * (absoluteRegion.getSizeX() - scale.x), absoluteRegion.minY + 0.5f * (absoluteRegion.getSizeY() - scale.y)); - textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), textureArea.minY + uy * textureArea.getSizeY()); + textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.getSizeX(), + textureArea.minY + uy * textureArea.getSizeY()); textureMat.setFloat2("texSize", uw * textureArea.getSizeX(), uh * textureArea.getSizeY()); break; } } - textureMat.setTexture("texture", ((TextureRegion)texture).getTexture()); + textureMat.setTexture("texture", ((TextureRegion) texture).getTexture()); textureMat.setFloat4("color", color.rf(), color.gf(), color.bf(), color.af() * alpha); textureMat.setMatrix4("projectionMatrix", projMatrix); @@ -324,11 +331,13 @@ public void drawTexture(UITextureRegion texture, Colorc color, ScaleMode mode, R } @Override - public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAlign vAlign, Rectanglei absoluteRegionRectangle, + public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAlign vAlign, + Rectanglei absoluteRegionRectangle, Colorc color, Colorc shadowColor, float alpha, boolean underlined) { Rectanglei absoluteRegion = new Rectanglei(absoluteRegionRectangle); - TextCacheKey key = new TextCacheKey(text, font, absoluteRegion.getSizeX(), hAlign, color, shadowColor, underlined); + TextCacheKey key = new TextCacheKey(text, font, absoluteRegion.getSizeX(), hAlign, color, shadowColor, + underlined); usedText.add(key); Map fontMesh = cachedText.get(key); List lines = TextLineBuilder.getLines(font, text, absoluteRegion.getSizeX()); @@ -341,7 +350,8 @@ public void drawText(String text, Font font, HorizontalAlign hAlign, VerticalAli } } if (fontMesh == null) { - fontMesh = fontMeshBuilder.createTextMesh((org.terasology.engine.rendering.assets.font.Font)font, lines, absoluteRegion.getSizeX(), hAlign, color, shadowColor, underlined); + fontMesh = fontMeshBuilder.createTextMesh((org.terasology.engine.rendering.assets.font.Font) font, lines, + absoluteRegion.getSizeX(), hAlign, color, shadowColor, underlined); cachedText.put(key, fontMesh); } @@ -370,15 +380,17 @@ public void drawTextureBordered(UITextureRegion texture, Rectanglei regionRectan Rectanglei region = new Rectanglei(regionRectangle); if (!currentTextureCropRegion.equals(requestedCropRegion) - && !(currentTextureCropRegion.containsRectangle(region) && requestedCropRegion.containsRectangle(region))) { + && !(currentTextureCropRegion.containsRectangle(region) && requestedCropRegion.containsRectangle(region))) { textureMat.setFloat4(CROPPING_BOUNDARIES_PARAM, requestedCropRegion.minX, requestedCropRegion.maxX, - requestedCropRegion.minY, requestedCropRegion.maxY); + requestedCropRegion.minY, requestedCropRegion.maxY); currentTextureCropRegion = requestedCropRegion; } - Vector2i textureSize = new Vector2i(TeraMath.ceilToInt(texture.getWidth() * uw), TeraMath.ceilToInt(texture.getHeight() * uh)); + Vector2i textureSize = new Vector2i(TeraMath.ceilToInt(texture.getWidth() * uw), + TeraMath.ceilToInt(texture.getHeight() * uh)); - TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(region.getSizeX(), region.getSizeY()), border, tile); + TextureCacheKey key = new TextureCacheKey(textureSize, new Vector2i(region.getSizeX(), region.getSizeY()), + border, tile); usedTextures.add(key); Mesh mesh = cachedTextures.get(key); if (mesh == null || mesh.isDisposed()) { @@ -404,9 +416,9 @@ public void drawTextureBordered(UITextureRegion texture, Rectanglei regionRectan if (tile) { addTiles(builder, new Rectanglei(border.getLeft(), 0).setSize(centerHoriz, border.getTop()), - new Rectanglef(left, 0, right, top), - new Vector2i(textureSize.x - border.getTotalWidth(), border.getTop()), - new Rectanglef(leftTex, 0, rightTex, topTex)); + new Rectanglef(left, 0, right, top), + new Vector2i(textureSize.x - border.getTotalWidth(), border.getTop()), + new Rectanglef(leftTex, 0, rightTex, topTex)); } else { addRectPoly(builder, left, 0, right, top, leftTex, 0, rightTex, topTex); } @@ -418,9 +430,9 @@ public void drawTextureBordered(UITextureRegion texture, Rectanglei regionRectan if (border.getLeft() != 0) { if (tile) { addTiles(builder, new Rectanglei(0, border.getTop()).setSize(border.getLeft(), centerVert), - new Rectanglef(0, top, left, bottom), - new Vector2i(border.getLeft(), textureSize.y - border.getTotalHeight()), - new Rectanglef(0, topTex, leftTex, bottomTex)); + new Rectanglef(0, top, left, bottom), + new Vector2i(border.getLeft(), textureSize.y - border.getTotalHeight()), + new Rectanglef(0, topTex, leftTex, bottomTex)); } else { addRectPoly(builder, 0, top, left, bottom, 0, topTex, leftTex, bottomTex); } @@ -428,19 +440,20 @@ public void drawTextureBordered(UITextureRegion texture, Rectanglei regionRectan if (tile) { addTiles(builder, new Rectanglei(border.getLeft(), border.getTop()).setSize(centerHoriz, centerVert), - new Rectanglef(left, top, right, bottom), - new Vector2i(textureSize.x - border.getTotalWidth(), textureSize.y - border.getTotalHeight()), - new Rectanglef(leftTex, topTex, rightTex, bottomTex)); + new Rectanglef(left, top, right, bottom), + new Vector2i(textureSize.x - border.getTotalWidth(), textureSize.y - border.getTotalHeight()), + new Rectanglef(leftTex, topTex, rightTex, bottomTex)); } else { addRectPoly(builder, left, top, right, bottom, leftTex, topTex, rightTex, bottomTex); } if (border.getRight() != 0) { if (tile) { - addTiles(builder, new Rectanglei(region.getSizeX() - border.getRight(), border.getTop()).setSize(border.getRight(), centerVert), - new Rectanglef(right, top, 1, bottom), - new Vector2i(border.getRight(), textureSize.y - border.getTotalHeight()), - new Rectanglef(rightTex, topTex, 1, bottomTex)); + addTiles(builder, + new Rectanglei(region.getSizeX() - border.getRight(), border.getTop()).setSize(border.getRight(), centerVert), + new Rectanglef(right, top, 1, bottom), + new Vector2i(border.getRight(), textureSize.y - border.getTotalHeight()), + new Rectanglef(rightTex, topTex, 1, bottomTex)); } else { addRectPoly(builder, right, top, 1, bottom, rightTex, topTex, 1, bottomTex); } @@ -451,10 +464,11 @@ public void drawTextureBordered(UITextureRegion texture, Rectanglei regionRectan addRectPoly(builder, 0, bottom, left, 1, 0, bottomTex, leftTex, 1); } if (tile) { - addTiles(builder, new Rectanglei(border.getLeft(), region.getSizeY() - border.getBottom()).setSize(centerHoriz, border.getBottom()), - new Rectanglef(left, bottom, right, 1), - new Vector2i(textureSize.x - border.getTotalWidth(), border.getBottom()), - new Rectanglef(leftTex, bottomTex, rightTex, 1)); + addTiles(builder, + new Rectanglei(border.getLeft(), region.getSizeY() - border.getBottom()).setSize(centerHoriz, border.getBottom()), + new Rectanglef(left, bottom, right, 1), + new Vector2i(textureSize.x - border.getTotalWidth(), border.getBottom()), + new Rectanglef(leftTex, bottomTex, rightTex, 1)); } else { addRectPoly(builder, left, bottom, right, 1, leftTex, bottomTex, rightTex, 1); } @@ -470,7 +484,8 @@ public void drawTextureBordered(UITextureRegion texture, Rectanglei regionRectan textureMat.setFloat2("offset", region.minX, region.minY); Rectanglef textureArea = texture.getRegion(); - textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.lengthX(), textureArea.minY + uy * textureArea.lengthY()); + textureMat.setFloat2("texOffset", textureArea.minX + ux * textureArea.lengthX(), + textureArea.minY + uy * textureArea.lengthY()); textureMat.setFloat2("texSize", uw * textureArea.lengthX(), uh * textureArea.lengthY()); textureMat.setTexture("texture", ((TextureRegion) texture).getTexture()); @@ -484,15 +499,18 @@ public void setUiScale(float uiScale) { // TODO: Implement? See https://github.com/MovingBlocks/TeraNUI/pull/2/commits/84ea7f936008fe123d3d6cf9d0d164b15b27cd6d } - private void addRectPoly(MeshBuilder builder, float minX, float minY, float maxX, float maxY, float texMinX, float texMinY, float texMaxX, float texMaxY) { - builder.addPoly(new Vector3f(minX, minY, 0), new Vector3f(maxX, minY, 0), new Vector3f(maxX, maxY, 0), new Vector3f(minX, maxY, 0)); + private void addRectPoly(MeshBuilder builder, float minX, float minY, float maxX, float maxY, float texMinX, + float texMinY, float texMaxX, float texMaxY) { + builder.addPoly(new Vector3f(minX, minY, 0), new Vector3f(maxX, minY, 0), new Vector3f(maxX, maxY, 0), + new Vector3f(minX, maxY, 0)); builder.addTexCoord(texMinX, texMinY); builder.addTexCoord(texMaxX, texMinY); builder.addTexCoord(texMaxX, texMaxY); builder.addTexCoord(texMinX, texMaxY); } - private void addTiles(MeshBuilder builder, Rectanglei drawRegion, Rectanglef subDrawRegion, Vector2i textureSize, Rectanglef subTextureRegion) { + private void addTiles(MeshBuilder builder, Rectanglei drawRegion, Rectanglef subDrawRegion, Vector2i textureSize, + Rectanglef subTextureRegion) { int tileW = textureSize.x; int tileH = textureSize.y; int horizTiles = TeraMath.fastAbs((drawRegion.getSizeX() - 1) / tileW) + 1; @@ -506,16 +524,27 @@ private void addTiles(MeshBuilder builder, Rectanglei drawRegion, Rectanglef sub int left = offsetX + tileW * tileX; int top = offsetY + tileH * tileY; - float vertLeft = subDrawRegion.minX + subDrawRegion.getSizeX() * Math.max((float) left / drawRegion.getSizeX(), 0); - float vertTop = subDrawRegion.minY + subDrawRegion.getSizeY() * Math.max((float) top / drawRegion.getSizeY(), 0); - float vertRight = subDrawRegion.minX + subDrawRegion.getSizeX() * Math.min((float) (left + tileW) / drawRegion.getSizeX(), 1); - float vertBottom = subDrawRegion.minY + subDrawRegion.getSizeY() * Math.min((float) (top + tileH) / drawRegion.getSizeY(), 1); - float texCoordLeft = subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.max(left, 0) - left) / tileW; - float texCoordTop = subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.max(top, 0) - top) / tileH; - float texCoordRight = subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.min(left + tileW, drawRegion.getSizeX()) - left) / tileW; - float texCoordBottom = subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.min(top + tileH, drawRegion.getSizeY()) - top) / tileH; - - addRectPoly(builder, vertLeft, vertTop, vertRight, vertBottom, texCoordLeft, texCoordTop, texCoordRight, texCoordBottom); + float vertLeft = + subDrawRegion.minX + subDrawRegion.getSizeX() * Math.max((float) left / drawRegion.getSizeX() + , 0); + float vertTop = + subDrawRegion.minY + subDrawRegion.getSizeY() * Math.max((float) top / drawRegion.getSizeY(), + 0); + float vertRight = + subDrawRegion.minX + subDrawRegion.getSizeX() * Math.min((float) (left + tileW) / drawRegion.getSizeX(), 1); + float vertBottom = + subDrawRegion.minY + subDrawRegion.getSizeY() * Math.min((float) (top + tileH) / drawRegion.getSizeY(), 1); + float texCoordLeft = + subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.max(left, 0) - left) / tileW; + float texCoordTop = + subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.max(top, 0) - top) / tileH; + float texCoordRight = subTextureRegion.minX + subTextureRegion.getSizeX() * (Math.min(left + tileW, + drawRegion.getSizeX()) - left) / tileW; + float texCoordBottom = subTextureRegion.minY + subTextureRegion.getSizeY() * (Math.min(top + tileH, + drawRegion.getSizeY()) - top) / tileH; + + addRectPoly(builder, vertLeft, vertTop, vertRight, vertBottom, texCoordLeft, texCoordTop, + texCoordRight, texCoordBottom); } } } @@ -540,7 +569,8 @@ private static class TextCacheKey { private final Colorc shadowColor; private final boolean underlined; - TextCacheKey(String text, Font font, int maxWidth, HorizontalAlign alignment, Colorc baseColor, Colorc shadowColor, boolean underlined) { + TextCacheKey(String text, Font font, int maxWidth, HorizontalAlign alignment, Colorc baseColor, + Colorc shadowColor, boolean underlined) { this.text = text; this.font = font; this.width = maxWidth; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java index 529bf44b93f..fd600ea33c5 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java @@ -85,8 +85,6 @@ import static com.google.common.base.Verify.verifyNotNull; -/** - */ public class NUIManagerInternal extends BaseComponentSystem implements NUIManager, PropertyChangeListener { private final ModuleEnvironment moduleEnvironment; private final TypeWidgetFactoryRegistry typeWidgetFactoryRegistry; @@ -152,9 +150,12 @@ public NUIManagerInternal(TerasologyCanvasRenderer renderer, Context context) { && bindsManager.getBindsConfig().hasBinds(new SimpleUri("engine:tabbingUI")) && bindsManager.getBindsConfig().hasBinds(new SimpleUri("engine:tabbingModifier")) && bindsManager.getBindsConfig().hasBinds(new SimpleUri("engine:activate"))) { - TabbingManager.tabForwardInput = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:tabbingUI")).get(0); - TabbingManager.tabBackInputModifier = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:tabbingModifier")).get(0); - TabbingManager.activateInput = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:activate")).get(0); + TabbingManager.tabForwardInput = + bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:tabbingUI")).get(0); + TabbingManager.tabBackInputModifier = bindsManager.getBindsConfig().getBinds(new SimpleUri("engine" + + ":tabbingModifier")).get(0); + TabbingManager.activateInput = + bindsManager.getBindsConfig().getBinds(new SimpleUri("engine:activate")).get(0); } moduleEnvironment = context.get(ModuleManager.class).getEnvironment(); @@ -187,7 +188,8 @@ public void setScreens(Deque toSet) { } public void refreshWidgetsLibrary() { - widgetsLibrary = new WidgetLibrary(context.get(ModuleManager.class).getEnvironment(), context.get(ReflectFactory.class), context.get(CopyStrategyLibrary.class)); + widgetsLibrary = new WidgetLibrary(context.get(ModuleManager.class).getEnvironment(), + context.get(ReflectFactory.class), context.get(CopyStrategyLibrary.class)); ModuleEnvironment environment = context.get(ModuleManager.class).getEnvironment(); for (Class type : environment.getSubtypesOf(UIWidget.class)) { Name module = verifyNotNull(environment.getModuleProviding(type), "No module provides %s", type); @@ -269,9 +271,10 @@ private void closeScreenWithoutEvent(ResourceUrn screenUri) { @Override public ResourceUrn getUri(UIScreenLayer screen) { - BiMap lookup = HashBiMap.create(screenLookup); + BiMap lookup = HashBiMap.create(screenLookup); return lookup.inverse().remove(screen); } + @Override public void closeScreen(UIScreenLayer screen) { if (screens.remove(screen)) { @@ -760,10 +763,13 @@ public void keyEvent(KeyEvent ev, EntityRef entity) { } } - //bind input events (will be send after raw input events, if a bind button was pressed and the raw input event hasn't consumed the event) + //bind input events (will be send after raw input events, if a bind button was pressed and the raw input event + // hasn't consumed the event) @ReceiveEvent(components = ClientComponent.class, priority = EventPriority.PRIORITY_HIGH) public void bindEvent(BindButtonEvent event, EntityRef entity) { - NUIBindButtonEvent nuiEvent = new NUIBindButtonEvent(mouse, keyboard, new ResourceUrn(event.getId().getModuleName(), event.getId().getObjectName()).toString(), event.getState()); + NUIBindButtonEvent nuiEvent = new NUIBindButtonEvent(mouse, keyboard, + new ResourceUrn(event.getId().getModuleName(), event.getId().getObjectName()).toString(), + event.getState()); if (focus != null) { focus.onBindEvent(nuiEvent); @@ -816,6 +822,7 @@ public void invalidate() { setHUDVisible(true); } } + @Override public CanvasControl getCanvas() { return canvas; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java index a8282d79b2f..4d0c4ab5d2b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasImpl.java @@ -27,8 +27,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -/** - */ public class TerasologyCanvasImpl extends CanvasImpl implements PropertyChangeListener { private static final Logger logger = LoggerFactory.getLogger(TerasologyCanvasImpl.class); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java index 2418c065c9a..827c5dccffb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TerasologyCanvasRenderer.java @@ -12,8 +12,6 @@ import org.terasology.nui.canvas.CanvasRenderer; import org.terasology.engine.rendering.assets.mesh.Mesh; -/** - */ public interface TerasologyCanvasRenderer extends CanvasRenderer { FrameBufferObject getFBO(ResourceUrn urn, Vector2ic size); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java index a3c19862ca4..e8e726f2151 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/TypeWidgetLibraryImpl.java @@ -40,7 +40,7 @@ public Optional getWidget(Binding binding, TypeInfo type) { @Override public Optional> getBuilder(TypeInfo type) { - try(ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { + try (ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { // Iterate in reverse order so that later added factories take priority for (TypeWidgetFactory factory : Lists.reverse(widgetFactories.getFactories())) { @@ -62,7 +62,7 @@ public Optional getWidget(Binding binding, Class type) { @Override public Optional getBaseTypeWidget(Binding binding, TypeInfo baseType) { - try(ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { + try (ModuleContext.ContextSpan ignored = ModuleContext.setContext(contextModule)) { if (Primitives.isWrapperType(baseType.getRawType()) || baseType.getRawType().isPrimitive()) { return getWidget(binding, baseType); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java index 4913a7c15d0..bcb1d06824c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/WidgetMetadata.java @@ -14,8 +14,6 @@ import java.lang.reflect.Field; -/** - */ public class WidgetMetadata extends ClassMetadata> { /** diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java index 631573b5499..17339b00582 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/CoreHudWidget.java @@ -12,8 +12,6 @@ import java.util.Arrays; import java.util.Iterator; -/** - */ public abstract class CoreHudWidget extends CoreWidget implements ControlWidget { @LayoutConfig diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java index 82a89b0c2f6..7c4d7eee0cb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HUDScreenLayer.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.Optional; -/** - */ public class HUDScreenLayer extends CoreScreenLayer { private Map elementsLookup = Maps.newLinkedHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java index 59ecd64b0f1..40161465c85 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/HudToolbar.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.nui.layers.hud; -/** - */ public class HudToolbar extends CoreHudWidget { @Override public void initialise() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java index 744eb26e753..f957753552f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/UICrosshair.java @@ -14,8 +14,6 @@ import java.util.List; -/** - */ public class UICrosshair extends CoreWidget { @LayoutConfig diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java index c7d088d3ba0..5799aac1006 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/DevToolsMenuScreen.java @@ -10,9 +10,7 @@ import org.terasology.engine.rendering.nui.editor.systems.NUIEditorSystem; import org.terasology.engine.rendering.nui.editor.systems.NUISkinEditorSystem; -/** - * - */ + public class DevToolsMenuScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:devToolsMenuScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java index 6c2752d5955..e283824e026 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/InspectionScreen.java @@ -10,8 +10,6 @@ import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.nui.BaseInteractionScreen; -/** - */ public class InspectionScreen extends BaseInteractionScreen { private UIText fullDescriptionLabel; private UIText entityIdField; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java index 7e7ff4b30fe..405c94406f0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/AllocationsMode.java @@ -6,8 +6,6 @@ import gnu.trove.map.TObjectDoubleMap; import org.terasology.engine.monitoring.PerformanceMonitor; -/** - */ final class AllocationsMode extends TimeMetricsMode { AllocationsMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java index 962da532f50..be22dfe6f63 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/HeapAllocationMode.java @@ -28,7 +28,8 @@ public String getMetrics() { for (MemoryPoolMXBean mpBean : ManagementFactory.getMemoryPoolMXBeans()) { if (mpBean.getType() == MemoryType.HEAP) { MemoryUsage usage = mpBean.getUsage(); - builder.append(String.format("Memory Heap: %s - Memory Usage: %.2f MB, Max Memory: %.2f MB \n", mpBean.getName(), usage.getUsed() / MB_SIZE, usage.getMax() / MB_SIZE)); + builder.append(String.format("Memory Heap: %s - Memory Usage: %.2f MB, Max Memory: %.2f MB \n", + mpBean.getName(), usage.getUsed() / MB_SIZE, usage.getMax() / MB_SIZE)); } } return builder.toString(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java index ec80b512eff..e07f2fec037 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NetworkStatsMode.java @@ -8,8 +8,6 @@ import org.terasology.engine.network.NetworkSystem; import org.terasology.engine.registry.CoreRegistry; -/** - */ final class NetworkStatsMode extends MetricsMode { private long lastTime; private Time time; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java index b3a4c170f38..8ccca7c16eb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/NullMetricsMode.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.nui.layers.ingame.metrics; -/** - */ public class NullMetricsMode extends MetricsMode { public NullMetricsMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java index 1c18e618879..21e5baa2a74 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningMeansMode.java @@ -6,8 +6,6 @@ import gnu.trove.map.TObjectDoubleMap; import org.terasology.engine.monitoring.PerformanceMonitor; -/** - */ final class RunningMeansMode extends TimeMetricsMode { RunningMeansMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java index 055ff0e36e3..65225765ad6 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/RunningThreadsMode.java @@ -6,8 +6,6 @@ import org.terasology.engine.monitoring.ThreadMonitor; import org.terasology.engine.monitoring.impl.SingleThreadMonitor; -/** - */ final class RunningThreadsMode extends MetricsMode { RunningThreadsMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java index a1a9a2d6e1b..6a53253a4a9 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/SpikesMode.java @@ -6,8 +6,6 @@ import gnu.trove.map.TObjectDoubleMap; import org.terasology.engine.monitoring.PerformanceMonitor; -/** - */ final class SpikesMode extends TimeMetricsMode { SpikesMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java index 0a42693c8cc..f31afd4c620 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/TimeMetricsMode.java @@ -10,8 +10,6 @@ import java.text.NumberFormat; import java.util.List; -/** - */ public abstract class TimeMetricsMode extends MetricsMode { private int limit; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java index 24a5a5c41fc..003777ddf72 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/WorldRendererMode.java @@ -5,8 +5,6 @@ import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.world.WorldRenderer; -/** - */ public class WorldRendererMode extends MetricsMode { public WorldRendererMode() { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java index b8118505d31..ee616c3821c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/AddServerPopup.java @@ -15,8 +15,6 @@ import java.util.function.Consumer; -/** - */ public class AddServerPopup extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:addServerPopup!instance"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java index 0bc17f1d573..14767bd181b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterTextPopup.java @@ -7,8 +7,6 @@ import org.terasology.nui.widgets.UIText; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class EnterTextPopup extends CoreScreenLayer { private Binding inputBinding; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java index 9eb2636cb34..0a23106e6ff 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java @@ -54,8 +54,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -/** - */ public class JoinGameScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:joinGameScreen"); @@ -479,8 +477,9 @@ private void refreshPing() { } catch (IOException e) { String text = translationSystem.translate("${engine:menu#connection-failed}"); // Check if selection name is same as earlier when response is received before updating ping field - if (name.equals(visibleList.getSelection().getName())) - GameThread.asynch(() -> ping.setText(FontColor.getColored(text, Color.RED))); + if (name.equals(visibleList.getSelection().getName())) { + GameThread.asynch(() -> ping.setText(FontColor.getColored(text, Color.RED))); + } } }); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java index 66a8a949dde..4325cee98ed 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java @@ -9,8 +9,6 @@ import org.terasology.nui.widgets.UILabel; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ @API public class MessagePopup extends CoreScreenLayer { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java index cb47b27b028..026f7839716 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/NewGameScreen.java @@ -25,7 +25,6 @@ import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.module.Module; import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; -import org.terasology.gestalt.module.resources.DirectoryFileSource; import org.terasology.gestalt.naming.Name; import org.terasology.input.Keyboard; import org.terasology.nui.Canvas; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java index 592be68c585..d4030918f41 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ReplayScreen.java @@ -69,11 +69,15 @@ public void initialise() { }); delete.subscribe(button -> { - TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, TwoButtonPopup.class); - confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup-title}"), + TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, + TwoButtonPopup.class); + confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup" + + "-title}"), translationSystem.translate("${engine:menu#remove-confirmation-popup-message}")); - confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), this::removeSelectedReplay); - confirmationPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { }); + confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), + this::removeSelectedReplay); + confirmationPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { + }); }); close.subscribe(button -> { @@ -91,7 +95,8 @@ public void onOpened() { refreshGameInfoList(GameProvider.getSavedRecordings()); } else { final MessagePopup popup = getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class); - popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), translationSystem.translate("${engine:menu#game-details-errors-message-body}")); + popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), + translationSystem.translate("${engine:menu#game-details-errors-message-body}")); popup.subscribeButton(e -> triggerBackAnimation()); getManager().pushScreen(popup); // disable child widgets @@ -108,7 +113,8 @@ protected void initWidgets() { } private void removeSelectedReplay() { - final Path world = PathManager.getInstance().getRecordingPath(getGameInfos().getSelection().getManifest().getTitle()); + final Path world = + PathManager.getInstance().getRecordingPath(getGameInfos().getSelection().getManifest().getTitle()); remove(getGameInfos(), world, REMOVE_STRING); } @@ -121,7 +127,8 @@ private void loadGame(GameInfo item) { CoreRegistry.get(GameEngine.class).changeState(new StateLoading(manifest, NetworkMode.NONE)); } catch (Exception e) { logger.error("Failed to load saved game", e); - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", e.getMessage()); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", + e.getMessage()); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java index 1adb2b2ff5e..cb2f01b96da 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java @@ -80,10 +80,13 @@ public String get() { }); delete.subscribe(e -> { - TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, TwoButtonPopup.class); - confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup-title}"), + TwoButtonPopup confirmationPopup = getManager().pushScreen(TwoButtonPopup.ASSET_URI, + TwoButtonPopup.class); + confirmationPopup.setMessage(translationSystem.translate("${engine:menu#remove-confirmation-popup" + + "-title}"), translationSystem.translate("${engine:menu#remove-confirmation-popup-message}")); - confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), this::removeSelectedGame); + confirmationPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), + this::removeSelectedGame); confirmationPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { }); }); @@ -99,7 +102,8 @@ public String get() { details.subscribe(e -> { final GameInfo gameInfo = getGameInfos().getSelection(); if (gameInfo != null) { - final GameDetailsScreen detailsScreen = getManager().createScreen(GameDetailsScreen.ASSET_URI, GameDetailsScreen.class); + final GameDetailsScreen detailsScreen = getManager().createScreen(GameDetailsScreen.ASSET_URI, + GameDetailsScreen.class); detailsScreen.setGameInfo(gameInfo); detailsScreen.setPreviews(previewSlideshow.getImages()); getManager().pushScreen(detailsScreen); @@ -109,7 +113,8 @@ public String get() { } private void removeSelectedGame() { - final Path world = PathManager.getInstance().getSavePath(getGameInfos().getSelection().getManifest().getTitle()); + final Path world = + PathManager.getInstance().getSavePath(getGameInfos().getSelection().getManifest().getTitle()); remove(getGameInfos(), world, REMOVE_STRING); } @@ -119,7 +124,8 @@ public void onOpened() { if (isValidScreen()) { if (GameProvider.isSavesFolderEmpty()) { - final NewGameScreen newGameScreen = getManager().createScreen(NewGameScreen.ASSET_URI, NewGameScreen.class); + final NewGameScreen newGameScreen = getManager().createScreen(NewGameScreen.ASSET_URI, + NewGameScreen.class); newGameScreen.setUniverseWrapper(universeWrapper); triggerForwardAnimation(newGameScreen); } @@ -131,7 +137,8 @@ public void onOpened() { refreshGameInfoList(GameProvider.getSavedGames()); } else { final MessagePopup popup = getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class); - popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), translationSystem.translate("${engine:menu#game-details-errors-message-body}")); + popup.setMessage(translationSystem.translate("${engine:menu#game-details-errors-message-title}"), + translationSystem.translate("${engine:menu#game-details-errors-message-body}")); popup.subscribeButton(e -> triggerBackAnimation()); getManager().pushScreen(popup); // disable child widgets @@ -162,10 +169,12 @@ private void loadGame(GameInfo item) { final GameManifest manifest = item.getManifest(); config.getWorldGeneration().setDefaultSeed(manifest.getSeed()); config.getWorldGeneration().setWorldTitle(manifest.getTitle()); - CoreRegistry.get(GameEngine.class).changeState(new StateLoading(manifest, (isLoadingAsServer()) ? NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); + CoreRegistry.get(GameEngine.class).changeState(new StateLoading(manifest, (isLoadingAsServer()) ? + NetworkMode.DEDICATED_SERVER : NetworkMode.NONE)); } catch (Exception e) { logger.error("Failed to load saved game", e); - getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", e.getMessage()); + getManager().pushScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error Loading Game", + e.getMessage()); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java index 067faea4969..009828a9da1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/ServerListDownloader.java @@ -121,10 +121,9 @@ private void download(String address) throws IOException { jsonReader.endArray(); - if(servers.size() == 0) { + if (servers.size() == 0) { status = String.format("Server Error!"); - } - else { + } else { status = String.format("${engine:menu#server-list-complete}"); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java index 40c57eef7b9..0837b1f2b57 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/UniverseSetupScreen.java @@ -14,7 +14,6 @@ import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.logic.behavior.asset.BehaviorTree; -import org.terasology.engine.logic.behavior.asset.BehaviorTreeData; import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; @@ -48,14 +47,11 @@ import org.terasology.gestalt.module.dependencyresolution.ResolutionResult; import org.terasology.gestalt.naming.Name; import org.terasology.nui.WidgetUtil; -import org.terasology.nui.asset.UIData; import org.terasology.nui.asset.UIElement; import org.terasology.nui.databinding.Binding; import org.terasology.nui.databinding.ReadOnlyBinding; import org.terasology.nui.itemRendering.StringTextRenderer; -import org.terasology.nui.skin.UISkin; import org.terasology.nui.skin.UISkinAsset; -import org.terasology.nui.skin.UISkinData; import org.terasology.nui.widgets.UIDropdownScrollable; import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.reflect.ReflectFactory; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java index d7c80af4a0c..1fc4e96abba 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/gameDetailsScreen/GameDetailsScreen.java @@ -245,10 +245,14 @@ private String getWorldDescription(final WorldInfo worldInfo) { } else { gameTitle = worldInfo.getCustomTitle(); } - return translationSystem.translate("${engine:menu#game-details-game-title} ") + gameTitle + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-game-seed} ") + worldInfo.getSeed() + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-world-generator}: ") + worldGeneratorManager.getWorldGeneratorInfo(worldInfo.getWorldGenerator()).getDisplayName() + '\n' + '\n' + - translationSystem.translate("${engine:menu#game-details-game-duration} ") + return translationSystem.translate("${engine:menu#game-details-game-title} ") + gameTitle + + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-game-seed} ") + worldInfo.getSeed() + + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-world-generator}: ") + + worldGeneratorManager.getWorldGeneratorInfo(worldInfo.getWorldGenerator()).getDisplayName() + + '\n' + '\n' + + translationSystem.translate("${engine:menu#game-details-game-duration} ") + DateTimeHelper.getDeltaBetweenTimestamps(new Date(0).getTime(), worldInfo.getTime()); } diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java index 39387358593..26d775372d0 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputConfigBinding.java @@ -11,8 +11,6 @@ import java.util.List; -/** - */ public class InputConfigBinding implements Binding { private BindsConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java index 7cbe0144e23..bf3e4fabf7c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/InputSettingsScreen.java @@ -50,9 +50,7 @@ import java.util.Objects; import java.util.Set; -/** - * - */ + public class InputSettingsScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:inputSettingsScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java index 5def706948f..60c61d7d11c 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/inputSettings/UIInputBind.java @@ -23,8 +23,6 @@ import java.util.List; -/** - */ public class UIInputBind extends CoreWidget { private boolean capturingInput; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java index 95932b3c8ac..f8f39aa0f26 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/loadingScreen/LoadingScreen.java @@ -8,8 +8,6 @@ import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class LoadingScreen extends CoreScreenLayer { private UILabel messageLabel; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java index 171faab22b4..e4177be8634 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/AudioSettingsScreen.java @@ -11,8 +11,6 @@ import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class AudioSettingsScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:AudioMenuScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java index 5ec1057f547..13012dd9b0a 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/SettingsMenuScreen.java @@ -12,8 +12,6 @@ import org.terasology.engine.registry.In; import org.terasology.engine.rendering.nui.CoreScreenLayer; -/** - */ public class SettingsMenuScreen extends CoreScreenLayer { public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:settingsMenuScreen"); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java index db0ba32900d..2388ac8abc4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSetting.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings; -/** - */ public enum CameraSetting { NORMAL("${engine:menu#camera-setting-normal}", 1), SMOOTH("${engine:menu#camera-setting-smooth}", 5), diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java index c4d16d4e4ab..18ea30ad1db 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/CameraSettingBinding.java @@ -5,8 +5,6 @@ import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class CameraSettingBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java index 93d73feddd7..ae6e45929da 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadows.java @@ -4,8 +4,6 @@ import org.terasology.engine.config.RenderingConfig; -/** - */ public enum DynamicShadows { OFF("${engine:menu#shadows-off}", false, false), ON("${engine:menu#shadows-on}", true, false), diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java index a2cf4f40955..11cccb1af8e 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/DynamicShadowsBinding.java @@ -5,8 +5,6 @@ import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class DynamicShadowsBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java index 416dd806d6b..20b5049a3cf 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/Preset.java @@ -4,8 +4,6 @@ import org.terasology.engine.config.RenderingConfig; -/** - */ public enum Preset { MINIMAL("${engine:menu#video-preset-minimal}") { @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java index f17ddfb37e6..d717fbceec1 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/PresetBinding.java @@ -5,8 +5,6 @@ import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class PresetBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java index d64ebcf21ba..d8d3acc8192 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflection.java @@ -4,8 +4,6 @@ import org.terasology.engine.config.RenderingConfig; -/** - */ public enum WaterReflection { SKY("${engine:menu#water-reflections-sky}") { @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java index 07e3630ff37..208aacd2f72 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/videoSettings/WaterReflectionBinding.java @@ -5,8 +5,6 @@ import org.terasology.engine.config.RenderingConfig; import org.terasology.nui.databinding.Binding; -/** - */ public class WaterReflectionBinding implements Binding { private RenderingConfig config; diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java index deac88e7406..6e9e5376300 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/UISkinFormat.java @@ -42,8 +42,6 @@ import java.util.Map; import java.util.Optional; -/** - */ @RegisterAssetFileFormat public class UISkinFormat extends AbstractAssetFileFormat { diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java index f17e39e1a8f..7ef41bb9682 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/UIButtonWebBrowser.java @@ -119,7 +119,7 @@ private void showConfirmationPopup() { translationSystem.translate("${engine:menu#button-web-browser-confirmation-message}") + NEW_LINE + this.url); confirmUrlPopup.setLeftButton(translationSystem.translate("${engine:menu#dialog-yes}"), this::openBrowser); - confirmUrlPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> {}); + confirmUrlPopup.setRightButton(translationSystem.translate("${engine:menu#dialog-no}"), () -> { }); try { if (webBrowserConfig != null) { confirmUrlPopup.setCheckbox(webBrowserConfig, this.url); diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java index 70b7c589223..e42b4050644 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java +++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/testScreens/BuiltinTypeWidgetTestScreen.java @@ -24,12 +24,12 @@ protected void addWidgets() { newBinding(TestEnum.class); - newBinding(new TypeInfo>() {}); - newBinding(new TypeInfo>() {}); + newBinding(new TypeInfo>() { }); + newBinding(new TypeInfo>() { }); newBinding(Boolean[].class); - newBinding(new TypeInfo() {}); - newBinding(new TypeInfo>>() {}); + newBinding(new TypeInfo() { }); + newBinding(new TypeInfo>>() { }); newBinding(WithFinalFields.class); @@ -44,9 +44,13 @@ private enum TestEnum { private String displayName; - TestEnum() {this(null);} + TestEnum() { + this(null); + } - TestEnum(String displayName) {this.displayName = displayName;} + TestEnum(String displayName) { + this.displayName = displayName; + } @Override diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java index eb8e43ec09c..fda8e5d745b 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/FBO.java @@ -483,7 +483,7 @@ public static void recreate(FBO fbo, FboConfig fboConfig) { } @Override - public String toString(){ + public String toString() { return "FBO: " + this.fboName; } diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java index 401e6bae64f..e477e2ff847 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/FrameBufferObject.java @@ -2,9 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.rendering.opengl; -/** - * - */ + public interface FrameBufferObject { void unbindFrame(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java index 0f4236b229e..d2e2b2729b8 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/GLSLMaterial.java @@ -61,7 +61,8 @@ public class GLSLMaterial extends BaseMaterial { private DisposalAction disposalAction; private MaterialData materialData; - public GLSLMaterial(ResourceUrn urn, AssetType assetType, MaterialData data, LwjglGraphicsProcessing graphicsProcessing, GLSLMaterial.DisposalAction disposalAction) { + public GLSLMaterial(ResourceUrn urn, AssetType assetType, MaterialData data, + LwjglGraphicsProcessing graphicsProcessing, GLSLMaterial.DisposalAction disposalAction) { super(urn, assetType, disposalAction); this.graphicsProcessing = graphicsProcessing; this.disposalAction = disposalAction; diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java index 9f157335068..5fddbd542cb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLMesh.java @@ -32,8 +32,6 @@ import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; -/** - */ public class OpenGLMesh extends Mesh { private static final Logger logger = LoggerFactory.getLogger(OpenGLMesh.class); private AABBf aabb = new AABBf(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java index 26c26deb355..23ed46e6755 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLSkeletalMesh.java @@ -28,8 +28,6 @@ import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; -/** - */ public class OpenGLSkeletalMesh extends SkeletalMesh { private static final int VERTEX_SIZE = 3 * Float.BYTES; private static final int NORMAL_SIZE = 3 * Float.BYTES; diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java index 7c80938a826..13a89423715 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/OpenGLTexture.java @@ -6,7 +6,6 @@ import org.joml.Vector2i; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.engine.core.subsystem.lwjgl.LwjglGraphics; import org.terasology.gestalt.assets.AssetType; import org.terasology.gestalt.assets.DisposableResource; import org.terasology.gestalt.assets.ResourceUrn; @@ -19,8 +18,6 @@ import java.nio.ByteBuffer; import java.util.List; -/** - */ public class OpenGLTexture extends Texture { private static final Logger logger = LoggerFactory.getLogger(OpenGLTexture.class); diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java index 8bdf0109e44..57e4468a8ae 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java +++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/ScreenGrabber.java @@ -182,8 +182,7 @@ public boolean isTakingScreenshot() { * * @param saveDirPath to save folder */ - public void takeGamePreview(final Path saveDirPath) - { + public void takeGamePreview(final Path saveDirPath) { this.savingGamePreview = true; this.savedGamePath = GamePreviewImageProvider.getNextGamePreviewImagePath(saveDirPath); this.saveScreenshot(); diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java index 2257b991666..d601ae5d44f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkTessellator.java @@ -36,7 +36,8 @@ public ChunkMesh generateMesh(ChunkView chunkView, float scale, int border) { final Stopwatch watch = Stopwatch.createStarted(); - // The mesh extends into the borders in the horizontal directions, but not vertically upwards, in order to cover gaps between LOD chunks of different scales, but also avoid multiple overlapping ocean surfaces. + // The mesh extends into the borders in the horizontal directions, but not vertically upwards, in order to cover + // gaps between LOD chunks of different scales, but also avoid multiple overlapping ocean surfaces. for (int x = 0; x < Chunks.SIZE_X; x++) { for (int z = 0; z < Chunks.SIZE_Z; z++) { for (int y = 0; y < Chunks.SIZE_Y - border * 2; y++) { diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java index 9989a9a739b..38cf00dd364 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java @@ -4,8 +4,6 @@ import org.terasology.gestalt.module.sandbox.API; -/** - */ @API public enum ChunkVertexFlag { NORMAL(0, "BLOCK_HINT_NORMAL"), diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java index 522fe7b2803..a8ce3c93ca4 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java +++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/Sphere.java @@ -19,7 +19,7 @@ public class Sphere { private boolean textureFlag = false; /** - * draws a sphere of the given radius centered around the origin. The sphere is subdivided around the z axis into + * draws a sphere of the given radius centered around the origin. The sphere is subdivided around the z axis into * slices and along the z axis into stacks (similar to lines of longitude and latitude). *

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

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

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

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

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

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

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

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

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

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

+ * Usage: dagNodeCommand + *

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

+ * Usage: dagRedirect + *

+ * Example: dagRedirect fbo blurredAmbientOcclusion 1 BasicRendering:outputToScreenNode 1 dagRedirect bufferpair + * backdrop 1 AdvancedRendering:intermediateHazeNode 1 */ @Command(shortDescription = "Debugging command for DAG.", requiredPermission = PermissionManager.NO_PERMISSION) - public void dagRedirect(@CommandParam("fromNodeUri") final String connectionTypeString, @CommandParam("fromNodeUri") final String fromNodeUri, @CommandParam("outputFboId") final int outputFboId, - @CommandParam("toNodeUri") final String toNodeUri, @CommandParam(value = "inputFboId") final int inputFboId) { + public void dagRedirect(@CommandParam("fromNodeUri") final String connectionTypeString, @CommandParam( + "fromNodeUri") final String fromNodeUri, @CommandParam("outputFboId") final int outputFboId, + @CommandParam("toNodeUri") final String toNodeUri, + @CommandParam(value = "inputFboId") final int inputFboId) { RenderGraph.ConnectionType connectionType; - if(connectionTypeString.equalsIgnoreCase("fbo")) { + if (connectionTypeString.equalsIgnoreCase("fbo")) { connectionType = RenderGraph.ConnectionType.FBO; } else if (connectionTypeString.equalsIgnoreCase("bufferpair")) { connectionType = RenderGraph.ConnectionType.BUFFER_PAIR; } else { - throw new RuntimeException(("Unsupported connection type: '" + connectionTypeString + "'. Expected 'fbo' or 'bufferpair'.\n")); + throw new RuntimeException(("Unsupported connection type: '" + connectionTypeString + "'. Expected 'fbo' " + + "or 'bufferpair'.\n")); } Node toNode = renderGraph.findNode(toNodeUri); @@ -524,9 +532,9 @@ public void dagRedirect(@CommandParam("fromNodeUri") final String connectionType throw new RuntimeException(("No node is associated with URI '" + fromNodeUri + "'")); } } - renderGraph.reconnectInputToOutput(fromNode, outputFboId, toNode, inputFboId, connectionType, true); - toNode.clearDesiredStateChanges(); - requestTaskListRefresh(); + renderGraph.reconnectInputToOutput(fromNode, outputFboId, toNode, inputFboId, connectionType, true); + toNode.clearDesiredStateChanges(); + requestTaskListRefresh(); } } diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java index ca588a95e10..c80397a13eb 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRendererSystem.java @@ -12,8 +12,6 @@ import org.terasology.engine.world.chunks.event.BeforeChunkUnload; import org.terasology.engine.world.chunks.event.OnChunkLoaded; -/** - */ @RegisterSystem(RegisterMode.CLIENT) public class WorldRendererSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java index 396e20048c0..f6b7696880f 100644 --- a/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java +++ b/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java @@ -5,35 +5,28 @@ import org.joml.Matrix4f; import org.joml.Vector2f; import org.joml.Vector3f; -import org.joml.Vector3i; import org.joml.Vector3ic; import org.joml.Vector4f; import org.lwjgl.opengl.GL11; +import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.rendering.assets.material.Material; +import org.terasology.engine.rendering.assets.mesh.Mesh; import org.terasology.engine.rendering.assets.shader.ShaderProgramFeature; import org.terasology.engine.rendering.assets.texture.Texture; import org.terasology.engine.rendering.assets.texture.TextureRegionAsset; import org.terasology.engine.rendering.cameras.Camera; import org.terasology.engine.rendering.primitives.Tessellator; import org.terasology.engine.rendering.primitives.TessellatorHelper; -import org.terasology.joml.geom.Rectanglef; -import org.terasology.gestalt.module.sandbox.API; -import org.terasology.engine.registry.CoreRegistry; -import org.terasology.engine.rendering.assets.mesh.Mesh; import org.terasology.engine.rendering.world.WorldRenderer; import org.terasology.engine.utilities.Assets; +import org.terasology.gestalt.module.sandbox.API; +import org.terasology.joml.geom.Rectanglef; -import static org.lwjgl.opengl.GL11.GL_MODELVIEW; import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.glBindTexture; import static org.lwjgl.opengl.GL11.glBlendFunc; import static org.lwjgl.opengl.GL11.glDisable; import static org.lwjgl.opengl.GL11.glEnable; -import static org.lwjgl.opengl.GL11.glMatrixMode; -import static org.lwjgl.opengl.GL11.glPopMatrix; -import static org.lwjgl.opengl.GL11.glPushMatrix; -import static org.lwjgl.opengl.GL11.glTranslated; /** * Renders a selection. Is used by the BlockSelectionSystem. diff --git a/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java b/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java index 9fdf11a1380..77a23c40370 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/GamePlayStatsComponent.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.terasology.engine.entitySystem.Component; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java index 59fa8c7fbb4..b31bb9b0b4d 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java @@ -1,32 +1,13 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.engine.context.Context; import org.terasology.engine.core.module.ModuleManager; -import org.terasology.gestalt.module.Module; import org.terasology.gestalt.module.ModuleEnvironment; -import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; -import org.terasology.gestalt.module.dependencyresolution.ResolutionResult; -import org.terasology.gestalt.module.predicates.FromModule; -import org.terasology.gestalt.module.resources.DirectoryFileSource; import org.terasology.gestalt.module.sandbox.API; -import org.terasology.gestalt.naming.Name; import org.terasology.engine.telemetry.metrics.Metric; import java.lang.reflect.Constructor; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java index e5694c4a1ad..f5b7fa70c88 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java index c1144aaade6..64fb04d7ae1 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryEmitter.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.snowplowanalytics.snowplow.tracker.emitter.BatchEmitter; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java index 34379ccec60..2530553d66a 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import org.terasology.gestalt.module.sandbox.API; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java index febb4ac1d25..f71d3b6bd2b 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.snowplowanalytics.snowplow.tracker.DevicePlatform; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java index f42d728338d..312adbd0310 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.google.common.collect.Maps; @@ -33,13 +20,7 @@ import org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender; import org.terasology.engine.telemetry.metrics.Metric; import org.terasology.gestalt.assets.ResourceUrn; -import org.terasology.gestalt.module.Module; import org.terasology.gestalt.module.ModuleEnvironment; -import org.terasology.gestalt.module.dependencyresolution.DependencyResolver; -import org.terasology.gestalt.module.dependencyresolution.ResolutionResult; -import org.terasology.gestalt.module.predicates.FromModule; -import org.terasology.gestalt.module.resources.DirectoryFileSource; -import org.terasology.gestalt.naming.Name; import org.terasology.nui.WidgetUtil; import org.terasology.nui.databinding.BindHelper; import org.terasology.nui.databinding.Binding; @@ -61,8 +42,8 @@ import java.util.Set; /** - * The metrics menu lists the telemetry field names and values that will be sent to the server. - * Users can enable or disable telemetry function in this menu. + * The metrics menu lists the telemetry field names and values that will be sent to the server. Users can enable or + * disable telemetry function in this menu. */ public class TelemetryScreen extends CoreScreenLayer { @@ -98,12 +79,14 @@ public void initialise() { refreshContent(); WidgetUtil.trySubscribe(this, "back", button -> triggerBackAnimation()); - WidgetUtil.tryBindCheckBoxWithListener(this, "telemetryEnabled", BindHelper.bindBeanProperty("telemetryEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { + WidgetUtil.tryBindCheckBoxWithListener(this, "telemetryEnabled", BindHelper.bindBeanProperty( + "telemetryEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { if (config.getTelemetryConfig().isTelemetryEnabled()) { pushAddServerPopupAndStartEmitter(); } }); - WidgetUtil.tryBindCheckBoxWithListener(this, "errorReportingEnabled", BindHelper.bindBeanProperty("errorReportingEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { + WidgetUtil.tryBindCheckBoxWithListener(this, "errorReportingEnabled", BindHelper.bindBeanProperty( + "errorReportingEnabled", config.getTelemetryConfig(), Boolean.TYPE), (checkbox) -> { if (config.getTelemetryConfig().isErrorReportingEnabled()) { pushAddServerPopupAndStartLogBackAppender(); } else { @@ -126,14 +109,16 @@ public void onOpened() { } /** - * Add a listener to the telemetryEnable checkbox. If the checkbox os enabled/disabled, it will enable/disable all the telemetry field. + * Add a listener to the telemetryEnable checkbox. If the checkbox os enabled/disabled, it will enable/disable all + * the telemetry field. */ private void addEnablingAllTelemetryListener() { UICheckbox uiCheckbox = this.find("telemetryEnabled", UICheckbox.class); if (uiCheckbox != null) { uiCheckbox.subscribe((checkbox) -> { boolean telemetryEnabled = config.getTelemetryConfig().isTelemetryEnabled(); - Map bindingMap = config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); + Map bindingMap = + config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); for (Map.Entry entry : bindingMap.entrySet()) { entry.setValue(telemetryEnabled); } @@ -144,7 +129,8 @@ private void addEnablingAllTelemetryListener() { if (categoryBox != null) { categoryBox.setEnabled(telemetryEnabled); } - Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), ReflectionUtils.withAnnotation(TelemetryField.class)); + Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), + ReflectionUtils.withAnnotation(TelemetryField.class)); for (Field field : fields) { String fieldName = telemetryCategory.getKey().id() + ":" + field.getName(); UICheckbox fieldBox = this.find(fieldName, UICheckbox.class); @@ -158,22 +144,24 @@ private void addEnablingAllTelemetryListener() { } /** - * Add a listener to the checkbox in the telemetry category row. - * If this checkbox is checked, all the sub telemetry fields will be enabled/disabled. + * Add a listener to the checkbox in the telemetry category row. If this checkbox is checked, all the sub telemetry + * fields will be enabled/disabled. */ private void addGroupEnablingListener() { fetchTelemetryCategoriesFromEngineOnlyEnvironment(); - for (Map.Entry telemetryCategory: telemetryCategories.entrySet()) { + for (Map.Entry telemetryCategory : telemetryCategories.entrySet()) { if (!telemetryCategory.getKey().isOneMapMetric()) { UICheckbox uiCheckbox = this.find(telemetryCategory.getKey().id(), UICheckbox.class); if (uiCheckbox == null) { continue; } uiCheckbox.subscribe((checkbox) -> { - Map bindingMap = config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); + Map bindingMap = + config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); if (bindingMap.containsKey(telemetryCategory.getKey().id())) { boolean isGroupEnable = bindingMap.get(telemetryCategory.getKey().id()); - Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), ReflectionUtils.withAnnotation(TelemetryField.class)); + Set fields = ReflectionUtils.getFields(telemetryCategory.getValue(), + ReflectionUtils.withAnnotation(TelemetryField.class)); for (Field field : fields) { String fieldName = telemetryCategory.getKey().id() + ":" + field.getName(); bindingMap.put(fieldName, isGroupEnable); @@ -190,7 +178,7 @@ private void refreshContent() { mainLayout.setVerticalSpacing(8); fetchTelemetryCategoriesFromEngineOnlyEnvironment(); - for (Map.Entry telemetryCategory: telemetryCategories.entrySet()) { + for (Map.Entry telemetryCategory : telemetryCategories.entrySet()) { Class metricClass = telemetryCategory.getValue(); Optional optional = metrics.getMetric(metricClass); if (optional.isPresent()) { @@ -223,11 +211,13 @@ private void pushAddServerPopupAndStartEmitter() { serverInfo.setOwner(telemetryConfig.getTelemetryServerOwner()); } catch (Exception e) { logger.error("Exception when get telemetry server information", e); - serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); + serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, + TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); serverInfo.setOwner(TelemetryEmitter.DEFAULT_COLLECTOR_OWNER); } } else { - serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); + serverInfo = new ServerInfo(TelemetryEmitter.DEFAULT_COLLECTOR_NAME, + TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); serverInfo.setOwner(TelemetryEmitter.DEFAULT_COLLECTOR_OWNER); } addServerPopup.setServerInfo(serverInfo); @@ -255,16 +245,19 @@ private void pushAddServerPopupAndStartLogBackAppender() { if (telemetryConfig.getErrorReportingDestination() != null) { try { URL url = new URL("http://" + telemetryConfig.getErrorReportingDestination()); - serverInfo = new ServerInfo(telemetryConfig.getErrorReportingServerName(), url.getHost(), url.getPort()); + serverInfo = new ServerInfo(telemetryConfig.getErrorReportingServerName(), url.getHost(), + url.getPort()); serverInfo.setOwner(telemetryConfig.getErrorReportingServerOwner()); } catch (Exception e) { logger.error("Exception when get telemetry server information", e); - serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, + serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, + TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT); serverInfo.setOwner(TelemetryLogstashAppender.DEFAULT_LOGSTASH_OWNER); } } else { - serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, + serverInfo = new ServerInfo(TelemetryLogstashAppender.DEFAULT_LOGSTASH_NAME, + TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT); serverInfo.setOwner(TelemetryLogstashAppender.DEFAULT_LOGSTASH_OWNER); } @@ -300,6 +293,7 @@ private void fetchTelemetryCategoriesFromEngineOnlyEnvironment() { /** * Add a new section with represents a new metrics type. + * * @param telemetryCategory the annotation of the new metric * @param layout the layout where the new section will be added * @param map the map which includes the telemetry field name and value @@ -337,6 +331,7 @@ private void addTelemetrySection(TelemetryCategory telemetryCategory, ColumnLayo /** * Get a binding to a map boolean value. + * * @param bindingMap the map. * @param fieldName the key associate to the binding value in the map. * @return @@ -357,18 +352,21 @@ public void set(Boolean value) { /** * Add a new row in the menu, the new row includes the field name and value. + * * @param type the type(name) of the this field * @param value the value of this field * @param layout the layout where the new line will be added * @param isWithCheckbox whether add a check box in the line * @param telemetryCategory the TelemetryCategory that this field belongs to */ - private void addTelemetryField(String type, Object value, ColumnLayout layout, boolean isWithCheckbox, TelemetryCategory telemetryCategory) { + private void addTelemetryField(String type, Object value, ColumnLayout layout, boolean isWithCheckbox, + TelemetryCategory telemetryCategory) { RowLayout newRow; if (isWithCheckbox) { String fieldName = telemetryCategory.id() + ":" + type; UICheckbox uiCheckbox = new UICheckbox(fieldName); - Map bindingMap = config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); + Map bindingMap = + config.getTelemetryConfig().getMetricsUserPermissionConfig().getBindingMap(); if (!bindingMap.containsKey(fieldName)) { bindingMap.put(fieldName, config.getTelemetryConfig().isTelemetryEnabled()); } @@ -378,7 +376,8 @@ private void addTelemetryField(String type, Object value, ColumnLayout layout, b if (bindingMap.get(fieldName)) { bindingMap.put(telemetryCategory.id(), true); } else { - Set fields = ReflectionUtils.getFields(telemetryCategories.get(telemetryCategory), ReflectionUtils.withAnnotation(TelemetryField.class)); + Set fields = ReflectionUtils.getFields(telemetryCategories.get(telemetryCategory), + ReflectionUtils.withAnnotation(TelemetryField.class)); boolean isOneEnabled = false; for (Field field : fields) { isOneEnabled = isOneEnabled || bindingMap.get(telemetryCategory.id() + ":" + field.getName()); @@ -401,14 +400,16 @@ private void addTelemetryField(String type, Object value, ColumnLayout layout, b } /** - * If the field value is a list, then will add more than one rows. - * Each new line includes the field name with index and its value. + * If the field value is a list, then will add more than one rows. Each new line includes the field name with index + * and its value. + * * @param type the type(name) of the this field * @param value the value of this field (a List) * @param layout the layout where the new line will be added * @param isWithCheckbox whether add a check box in the line */ - private void addTelemetryField(String type, List value, ColumnLayout layout, boolean isWithCheckbox, TelemetryCategory telemetryCategory) { + private void addTelemetryField(String type, List value, ColumnLayout layout, boolean isWithCheckbox, + TelemetryCategory telemetryCategory) { int moduleCount = 1; for (Object o : value) { StringBuilder sb = new StringBuilder(); @@ -422,6 +423,7 @@ private void addTelemetryField(String type, List value, ColumnLayout layout, boo /** * Sorts the fields by the name of each fields. + * * @param map the map that will be sorted * @return a list of map entry that is ordered by fields' names */ diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java index d663c4ef2eb..e38f002fa59 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetrySystem.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import com.snowplowanalytics.snowplow.tracker.emitter.Emitter; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java index 1f9aa9d0230..d2fca5268de 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry; import ch.qos.logback.classic.LoggerContext; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java index ab3d59bbd17..56c068ff79d 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/ModulesJsonProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java index 1ec8958d9d1..ffb29158dd8 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/SystemContextJsonProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java index 4328811698c..1abe75463bd 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/TelemetryLogstashAppender.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import ch.qos.logback.classic.LoggerContext; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java b/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java index 4ee98e211b0..d56b3f4ce18 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/logstash/UserIdJsonProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.logstash; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java index d6385c458bf..7b7255c72dd 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockDestroyedMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java index 7b458f2ac7e..76d63fec850 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/BlockPlacedMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java index a885f67e6ee..795985f14ea 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/CreatureKilledMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java index 14b45eb7c31..deaa96b3d01 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/GamePlayMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java index 129da58ace0..b1fabf55d4c 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java index 003e28aec2a..8a2b346dee9 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/ModulesMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java index 932cf7924ef..ffba1048d0b 100644 --- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java +++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/SystemContextMetric.java @@ -1,18 +1,5 @@ -/* - * Copyright 2017 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.telemetry.metrics; import com.snowplowanalytics.snowplow.tracker.events.Unstructured; diff --git a/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java b/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java index 8ea8b032761..19f0e6beee6 100644 --- a/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java +++ b/engine/src/main/java/org/terasology/engine/unicode/Dingbats.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.unicode; diff --git a/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java b/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java index 12ed7c60c26..0ec9d695639 100644 --- a/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java +++ b/engine/src/main/java/org/terasology/engine/unicode/EnclosedAlphanumerics.java @@ -1,18 +1,5 @@ -/* - * Copyright 2015 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.unicode; diff --git a/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java b/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java index eab984f1930..eee869c10bb 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java +++ b/engine/src/main/java/org/terasology/engine/utilities/FilesUtil.java @@ -10,8 +10,6 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; -/** - */ public final class FilesUtil { /** diff --git a/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java b/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java index 0bc59a6a40a..105068231a0 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java +++ b/engine/src/main/java/org/terasology/engine/utilities/NativeHelper.java @@ -6,8 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - */ public final class NativeHelper { private static final Logger logger = LoggerFactory.getLogger(NativeHelper.class); diff --git a/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java b/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java index c371e25df02..a009102d908 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java +++ b/engine/src/main/java/org/terasology/engine/utilities/ReflectionUtil.java @@ -33,9 +33,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -/** - * - */ + public final class ReflectionUtil { private ReflectionUtil() { } diff --git a/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java b/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java index 8a8b28757c7..2151da4dae6 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java +++ b/engine/src/main/java/org/terasology/engine/utilities/collection/CharSequenceIterator.java @@ -5,8 +5,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; -/** - */ public class CharSequenceIterator implements Iterator { private final CharSequence sequence; diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java index e9b2f15d037..f14c638b1cb 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java +++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/AbstractTask.java @@ -3,8 +3,6 @@ package org.terasology.engine.utilities.concurrency; -/** - */ public abstract class AbstractTask implements Task { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java index 3a1b1eb226b..3175d12c0f7 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java +++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/ShutdownTask.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.utilities.concurrency; -/** - */ public class ShutdownTask implements Task { @Override public String getName() { diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java index da0ec43053f..b0e55dc1a60 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java +++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/TaskProcessor.java @@ -11,8 +11,6 @@ import java.util.concurrent.BlockingQueue; -/** - */ final class TaskProcessor implements Runnable { private static final Logger logger = LoggerFactory.getLogger(TaskProcessor.class); diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java index 11f43c4e618..4aa48906bf7 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/AssetTypeAdapter.java @@ -11,8 +11,6 @@ import java.lang.reflect.Type; -/** - */ public class AssetTypeAdapter implements JsonDeserializer { private Class type; diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java b/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java index 64c21c710e6..535a3c051f1 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/InputHandler.java @@ -15,8 +15,6 @@ import java.lang.reflect.Type; -/** - */ public class InputHandler implements JsonSerializer, JsonDeserializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java index 63238a46abd..02003d09905 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/QuaternionfTypeAdapter.java @@ -12,8 +12,6 @@ import java.lang.reflect.Type; -/** - */ public class QuaternionfTypeAdapter implements JsonDeserializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java index 927d9cfcbcc..ce42931d363 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/SetMultimapTypeAdapter.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map; -/** - */ public class SetMultimapTypeAdapter implements JsonDeserializer>, JsonSerializer> { private Class valueType; diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java index 6c6cc460f66..024e04934b3 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2fTypeAdapter.java @@ -12,8 +12,6 @@ import java.lang.reflect.Type; -/** - */ public class Vector2fTypeAdapter implements JsonDeserializer { @Override public Vector2f deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java index b55d4160e5f..173f73a4b06 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector2iTypeAdapter.java @@ -12,8 +12,6 @@ import java.lang.reflect.Type; -/** - */ public class Vector2iTypeAdapter implements JsonDeserializer { @Override public Vector2i deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java index b84ab740e05..d44fe157f60 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector3fTypeAdapter.java @@ -12,8 +12,6 @@ import java.lang.reflect.Type; -/** - */ public class Vector3fTypeAdapter implements JsonDeserializer { @Override public Vector3f deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java index 8559172826e..6906a008617 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java +++ b/engine/src/main/java/org/terasology/engine/utilities/gson/Vector4fTypeAdapter.java @@ -12,8 +12,6 @@ import java.lang.reflect.Type; -/** - */ public class Vector4fTypeAdapter implements JsonDeserializer { @Override diff --git a/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java b/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java index 89f03dc683a..d710ef8489e 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java +++ b/engine/src/main/java/org/terasology/engine/utilities/procedural/Voronoi.java @@ -8,8 +8,6 @@ import java.util.Random; -/** - */ public class Voronoi { private static final float DENSITY_ADJUSTMENT = 0.39815f; diff --git a/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java b/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java index 36c03c26ad3..5a5943de807 100644 --- a/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java +++ b/engine/src/main/java/org/terasology/engine/utilities/reflection/SpecificAccessibleObject.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.utilities.reflection; -/** - */ import com.google.common.base.Preconditions; diff --git a/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java b/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java index 01ea0a56f6c..175eadc7b17 100644 --- a/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java +++ b/engine/src/main/java/org/terasology/engine/world/RelevanceRegionComponent.java @@ -5,8 +5,6 @@ import org.joml.Vector3i; import org.terasology.engine.entitySystem.Component; -/** - */ public class RelevanceRegionComponent implements Component { public Vector3i distance = new Vector3i(1, 1, 1); diff --git a/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java b/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java index e907a3c23ec..88e04417908 100644 --- a/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java +++ b/engine/src/main/java/org/terasology/engine/world/WorldChangeListener.java @@ -6,8 +6,6 @@ import org.joml.Vector3ic; import org.terasology.engine.world.block.Block; -/** - */ public interface WorldChangeListener { void onBlockChanged(Vector3ic pos, Block newBlock, Block originalBlock); diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java b/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java index adadefd0a6c..0dcbc010e22 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockBuilderHelper.java @@ -33,15 +33,17 @@ public interface BlockBuilderHelper { Block constructSimpleBlock(BlockFamilyDefinition definition, String section, BlockUri uri, BlockFamily blockFamily); /** - * Constructs a basic block from the data provided. This block is assumed to have no rotations, and to use reasonable defaults - * The block is registered into the engine as to be directly usable + * Constructs a basic block from the data provided. This block is assumed to have no rotations, and to use + * reasonable defaults The block is registered into the engine as to be directly usable *

- * For blocks that contain rotations or that use custom values see {@link #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily)} and {@link #constructCustomBlock(String, BlockShape, Rotation, SectionDefinitionData, BlockUri, BlockFamily)} + * For blocks that contain rotations or that use custom values see + * {@link #constructTransformedBlock(BlockFamilyDefinition, Rotation, BlockUri, BlockFamily)} and + * {@link #constructCustomBlock(String, BlockShape, Rotation, SectionDefinitionData, BlockUri, BlockFamily)} * - * @param definition The definition for the block family this block should belong to - * @param shape The shape this block should be displayed with - * @param section The block family subsection this block will represent - * @param uri The URI to use for the block + * @param definition The definition for the block family this block should belong to + * @param shape The shape this block should be displayed with + * @param section The block family subsection this block will represent + * @param uri The URI to use for the block * @param blockFamily The block family instance this block will belong to * @return The constructed and registered block */ diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java b/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java index 08fb42366e4..419be1e4b69 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockExplorer.java @@ -9,8 +9,6 @@ import java.util.Set; import java.util.stream.Collectors; -/** - */ public class BlockExplorer { private AssetManager assetManager; diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java b/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java index 5350a245249..6a246be8ee5 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockLifecycleEvent.java @@ -12,8 +12,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; -/** - */ //FIXME: There is a mismatch between `blockCount` and iterated blocks. // I don't get what this event is about, and how it should behave. The `TIntList positions` is a flattened list // of positions. So if this event affects diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java b/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java index e442e6fb670..900f90c74df 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockManager.java @@ -8,8 +8,6 @@ import java.util.Collection; import java.util.Map; -/** - */ public abstract class BlockManager { public static final BlockUri AIR_ID = new BlockUri(new ResourceUrn("engine:air")); diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java b/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java index 567ae72f04f..7022fb02823 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockPart.java @@ -10,8 +10,6 @@ import java.util.EnumMap; import java.util.List; -/** - */ public enum BlockPart { TOP(Side.TOP), LEFT(Side.LEFT), diff --git a/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java b/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java index 626b5831d44..4bad4bb3f21 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java +++ b/engine/src/main/java/org/terasology/engine/world/block/BlockUriParseException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.block; -/** - */ public class BlockUriParseException extends RuntimeException { private static final long serialVersionUID = 5571599578432666018L; diff --git a/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java b/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java index f9aa577987b..853c236abef 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java +++ b/engine/src/main/java/org/terasology/engine/world/block/ForceBlockActive.java @@ -7,8 +7,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface ForceBlockActive { diff --git a/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java b/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java index 2af1789fdd8..3c2509ce74d 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java +++ b/engine/src/main/java/org/terasology/engine/world/block/RequiresBlockLifecycleEvents.java @@ -7,8 +7,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RequiresBlockLifecycleEvents { diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java b/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java index e16f3ba532c..36390c03791 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/damage/BlockDamageModifierComponent.java @@ -7,8 +7,6 @@ import java.util.Map; -/** - */ public class BlockDamageModifierComponent implements Component { public Map materialDamageMultiplier = Maps.newHashMap(); diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java index ae306b7cf7a..897d9d1d523 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateFinished.java @@ -4,7 +4,5 @@ import org.terasology.engine.entitySystem.event.Event; -/** - */ public class LargeBlockUpdateFinished implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java index 7de175ad08b..7d94aca7111 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/LargeBlockUpdateStarting.java @@ -4,7 +4,5 @@ import org.terasology.engine.entitySystem.event.Event; -/** - */ public class LargeBlockUpdateStarting implements Event { } diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java index f9b3a564a9e..104618e8825 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/BlockPlacingSystem.java @@ -12,8 +12,6 @@ import org.terasology.engine.world.WorldComponent; import org.terasology.engine.world.WorldProvider; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class BlockPlacingSystem extends BaseComponentSystem { @In diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java index 8d29addf208..a901318479d 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java +++ b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/PlaceBlocks.java @@ -11,8 +11,6 @@ import java.util.Collections; import java.util.Map; -/** - */ public class PlaceBlocks extends AbstractConsumableEvent { private Map blocks; private EntityRef instigator; diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java b/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java index b57c7cc8319..103bc92367d 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java +++ b/engine/src/main/java/org/terasology/engine/world/block/family/BlockFamilyLibrary.java @@ -4,10 +4,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.context.Context; +import org.terasology.engine.registry.InjectionHelper; +import org.terasology.engine.world.block.BlockBuilderHelper; import org.terasology.engine.world.block.loader.BlockFamilyDefinition; import org.terasology.engine.world.block.shapes.BlockShape; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.module.ModuleEnvironment; import org.terasology.gestalt.util.reflection.ParameterProvider; import org.terasology.gestalt.util.reflection.SimpleClassFactory; @@ -16,8 +18,6 @@ import org.terasology.reflection.metadata.ClassMetadata; import org.terasology.reflection.metadata.DefaultModuleClassLibrary; import org.terasology.reflection.reflect.ReflectFactory; -import org.terasology.engine.registry.InjectionHelper; -import org.terasology.engine.world.block.BlockBuilderHelper; import java.util.Optional; @@ -72,7 +72,9 @@ public Class getBlockFamily(String uri) { * @param blockBuilderHelper * @return */ - public static BlockFamily createFamily(Class blockFamily, BlockFamilyDefinition blockFamilyDefinition, BlockBuilderHelper blockBuilderHelper) { + public static BlockFamily createFamily(Class blockFamily, + BlockFamilyDefinition blockFamilyDefinition, + BlockBuilderHelper blockBuilderHelper) { try { SimpleClassFactory simpleClassFactory = new SimpleClassFactory(new ParameterProvider() { @Override @@ -107,7 +109,9 @@ public Optional get(Class type) { * @param shape * @return new BlockFamily */ - public static BlockFamily createFamily(Class blockFamily, BlockFamilyDefinition blockFamilyDefinition, BlockShape shape, BlockBuilderHelper blockBuilderHelper) { + public static BlockFamily createFamily(Class blockFamily, + BlockFamilyDefinition blockFamilyDefinition, BlockShape shape, + BlockBuilderHelper blockBuilderHelper) { try { SimpleClassFactory simpleClassFactory = new SimpleClassFactory(new ParameterProvider() { @Override diff --git a/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java b/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java index abc03dd6eef..346e5377f53 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java +++ b/engine/src/main/java/org/terasology/engine/world/block/internal/BlockPrefabManager.java @@ -12,8 +12,6 @@ import java.util.Optional; -/** - */ public class BlockPrefabManager implements BlockRegistrationListener { private EntityManager entityManager; diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java index bc8d88c91bc..f1b44e65ad2 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java @@ -5,8 +5,6 @@ import org.terasology.engine.entitySystem.prefab.Prefab; import org.terasology.gestalt.module.sandbox.API; -/** - */ @API public class EntityData { private Prefab prefab; diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java index d74ff14d0c4..18c867b805c 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java @@ -4,8 +4,6 @@ import org.terasology.gestalt.module.sandbox.API; -/** - */ @API public class InventoryData { private boolean directPickup; diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java index b0c0f8d15d6..308af84c951 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java @@ -12,8 +12,6 @@ import java.util.EnumMap; -/** - */ @API public class SectionDefinitionData { private String displayName = ""; diff --git a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java index 26554418fc9..73eb0e7172c 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java +++ b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionComponent.java @@ -7,9 +7,7 @@ import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.BlockRegion; -/** - * - */ + public class BlockRegionComponent implements Component { /** * May be null. diff --git a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java index e2f57951fae..d17d82f1ce9 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/regions/BlockRegionSystem.java @@ -14,8 +14,6 @@ import org.terasology.engine.world.WorldProvider; import org.terasology.engine.world.block.BlockManager; -/** - */ @RegisterSystem(RegisterMode.AUTHORITY) public class BlockRegionSystem extends BaseComponentSystem { diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java index e6b73a3a417..14099dac4e8 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeData.java @@ -11,8 +11,6 @@ import java.util.EnumMap; -/** - */ public class BlockShapeData implements AssetData { private String displayName = ""; private EnumMap meshParts = Maps.newEnumMap(BlockPart.class); diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java index eaf0b64532a..b37c94f865a 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/BlockShapeImpl.java @@ -18,8 +18,6 @@ import java.util.EnumMap; import java.util.Map; -/** - */ public class BlockShapeImpl extends BlockShape { private String displayName; diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java index 2d154c4b3b4..4b8ee4066d5 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java +++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/JsonBlockShapeLoader.java @@ -38,8 +38,6 @@ import static org.terasology.engine.physics.engine.PhysicsEngineManager.COLLISION_SHAPE_FACTORY; -/** - */ @RegisterAssetFileFormat public class JsonBlockShapeLoader extends AbstractAssetFileFormat { private Gson gson; diff --git a/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java b/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java index a346d3ce818..8bd5e386ee2 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java +++ b/engine/src/main/java/org/terasology/engine/world/block/structure/BlockStructuralSupportSystem.java @@ -28,8 +28,6 @@ import java.util.Map; import java.util.Set; -/** - */ @RegisterSystem @Share(BlockStructuralSupportRegistry.class) public class BlockStructuralSupportSystem extends BaseComponentSystem implements BlockStructuralSupportRegistry { diff --git a/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java b/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java index e8ca9f0d467..17c00e989ad 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java +++ b/engine/src/main/java/org/terasology/engine/world/block/structure/SideBlockSupportRequired.java @@ -32,7 +32,8 @@ public int getPriority() { public boolean shouldBeRemovedDueToChange(Vector3i location, Side sideChanged) { final SideBlockSupportRequiredComponent component = getComponent(location, Collections.emptyMap()); if (component != null) { - final boolean sufficientlySupported = isSufficientlySupported(location, sideChanged, Collections.emptyMap(), component); + final boolean sufficientlySupported = isSufficientlySupported(location, sideChanged, + Collections.emptyMap(), component); if (!sufficientlySupported) { if (component.dropDelay <= 0) { return true; @@ -49,11 +50,13 @@ public boolean shouldBeRemovedDueToChange(Vector3i location, Side sideChanged) { } @ReceiveEvent - public void checkForSupport(DelayedActionTriggeredEvent event, EntityRef entity, BlockComponent block, SideBlockSupportRequiredComponent supportRequired) { + public void checkForSupport(DelayedActionTriggeredEvent event, EntityRef entity, BlockComponent block, + SideBlockSupportRequiredComponent supportRequired) { if (event.getActionId().equals(SUPPORT_CHECK_ACTION_ID)) { if (!isSufficientlySupported(block.getPosition(), null, Collections.emptyMap(), supportRequired)) { PrefabManager prefabManager = CoreRegistry.get(PrefabManager.class); - entity.send(new DestroyEvent(entity, EntityRef.NULL, prefabManager.getPrefab("engine:supportRemovedDamage"))); + entity.send(new DestroyEvent(entity, EntityRef.NULL, prefabManager.getPrefab("engine" + + ":supportRemovedDamage"))); } } } @@ -80,11 +83,14 @@ private EntityRef getEntity(Vector3ic location, Map } } - private SideBlockSupportRequiredComponent getComponent(Vector3ic location, Map blockOverrides) { + private SideBlockSupportRequiredComponent getComponent(Vector3ic location, + Map blockOverrides) { return getEntity(location, blockOverrides).getComponent(SideBlockSupportRequiredComponent.class); } - private boolean isSufficientlySupported(Vector3ic location, Side sideChanged, Map blockOverrides, SideBlockSupportRequiredComponent supportComponent) { + private boolean isSufficientlySupported(Vector3ic location, Side sideChanged, + Map blockOverrides, + SideBlockSupportRequiredComponent supportComponent) { if (supportComponent != null) { if ((sideChanged == null || sideChanged.isHorizontal()) && supportComponent.sideAllowed && !hasSupport(location, supportComponent, blockOverrides)) { @@ -97,7 +103,8 @@ private boolean isSufficientlySupported(Vector3ic location, Side sideChanged, Ma return true; } - private boolean hasSupport(Vector3ic blockPosition, SideBlockSupportRequiredComponent supportComponent, Map blockOverrides) { + private boolean hasSupport(Vector3ic blockPosition, SideBlockSupportRequiredComponent supportComponent, Map blockOverrides) { if (supportComponent.bottomAllowed && hasSupportFromBlockOnSide(blockPosition, Side.BOTTOM, blockOverrides)) { return true; } @@ -113,7 +120,8 @@ private boolean hasSupport(Vector3ic blockPosition, SideBlockSupportRequiredComp return false; } - private boolean hasSupportFromBlockOnSide(Vector3ic blockPosition, Side side, Map blockOverrides) { + private boolean hasSupportFromBlockOnSide(Vector3ic blockPosition, Side side, + Map blockOverrides) { final Vector3i sideBlockPosition = side.getAdjacentPos(blockPosition, new Vector3i()); if (!getWorldProvider().isBlockRelevant(sideBlockPosition)) { return true; diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java index 39f3f61f29a..63c3c4f8458 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java @@ -13,8 +13,6 @@ import java.util.List; import java.util.function.Consumer; -/** - */ @API public class BlockTile extends Asset { private BufferedImage[] images; diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java index 847cce8852c..f87886a47ee 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileData.java @@ -6,8 +6,6 @@ import java.awt.image.BufferedImage; -/** - */ public class TileData implements AssetData { private BufferedImage[] images; private boolean autoBlock; diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java index ed70bc924e9..75867b9786f 100644 --- a/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java +++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/TileFormat.java @@ -34,13 +34,12 @@ public TileData load(ResourceUrn resourceUrn, List list) throws I if (!IntMath.isPowerOfTwo(image.getHeight()) || image.getWidth() % image.getHeight() != 0 || image.getWidth() == 0) { throw new IOException("Invalid tile - must be horizontal row of power-of-two sized squares"); } - BufferedImage[] frames = new BufferedImage[image.getWidth()/image.getHeight()]; - for (int i=0; i requiredChunks; // The sizes of all of the LOD chunks that are meant to exist. All the chunks at the same positions with larger sizes also may exist, but don't always. + // The sizes of all of the LOD chunks that are meant to exist. All the chunks at the same positions with larger + // sizes also may exist, but don't always. + private Map requiredChunks; private ArrayList> chunks = new ArrayList<>(); private ClosenessComparator nearby; @@ -58,7 +62,8 @@ public class LodChunkProvider { private BlockingQueue readyChunks = Queues.newLinkedBlockingQueue(); private List generationThreads = new ArrayList<>(); - public LodChunkProvider(Context context, ScalableWorldGenerator generator, ChunkTessellator tessellator, ViewDistance viewDistance, int chunkLods, Vector3i center) { + public LodChunkProvider(Context context, ScalableWorldGenerator generator, ChunkTessellator tessellator, + ViewDistance viewDistance, int chunkLods, Vector3i center) { chunkProvider = context.get(ChunkProvider.class); blockManager = context.get(BlockManager.class); extraDataManager = context.get(ExtraBlockDataManager.class); @@ -91,11 +96,13 @@ private void createChunks() { generator.createChunk(chunk, (1 << scale) * (2f / (Chunks.SIZE_X - 2) + 1)); InternalLightProcessor.generateInternalLighting(chunk, 1 << scale); //tintChunk(chunk); - ChunkView view = new ChunkViewCoreImpl(new Chunk[]{chunk}, new BlockRegion(chunk.getPosition(new Vector3i())), new Vector3i(), unloaded); + ChunkView view = new ChunkViewCoreImpl(new Chunk[]{chunk}, + new BlockRegion(chunk.getPosition(new Vector3i())), new Vector3i(), unloaded); ChunkMesh mesh = tessellator.generateMesh(view, 1 << scale, 1); readyChunks.add(new LodChunk(pos, mesh, scale)); } - } catch (InterruptedException ignored) { } + } catch (InterruptedException ignored) { + } } private void processReadyChunks() { @@ -104,7 +111,8 @@ private void processReadyChunks() { Vector3i pos = chunk.getPosition(new Vector3i()); Integer requiredScale = requiredChunks.get(pos); int scale = chunk.scale; - if (requiredScale != null && requiredScale <= scale) { // The relevant region may have been updated since this chunk was requested. + if (requiredScale != null && requiredScale <= scale) { // The relevant region may have been updated since + // this chunk was requested. chunk.getMesh().generateVBOs(); chunk.getMesh().discardData(); Vector3i subPos = new Vector3i(); @@ -126,7 +134,8 @@ private void processReadyChunks() { chunks.get(scale).put(new Vector3i(pos), chunk); if (scale < chunkLods) { int mask = ~(1 << scale); - LodChunk largerChunk = chunks.get(scale + 1).get(new Vector3i(pos.x & mask, pos.y & mask, pos.z & mask)); + LodChunk largerChunk = chunks.get(scale + 1).get(new Vector3i(pos.x & mask, pos.y & mask, + pos.z & mask)); if (largerChunk != null) { largerChunk.hiddenness++; } @@ -146,9 +155,10 @@ public void updateRenderableRegion(ViewDistance newViewDistance, int newChunkLod chunkLods = newChunkLods; nearby.pos = center; Vector3i viewDistance = new Vector3i(newViewDistance.getChunkDistance()).div(2); - Vector3i altViewDistance = viewDistance.add(1 - Math.abs(viewDistance.x % 2), 1 - Math.abs(viewDistance.y % 2), 1 - Math.abs(viewDistance.z % 2), new Vector3i()); + Vector3i altViewDistance = viewDistance.add(1 - Math.abs(viewDistance.x % 2), + 1 - Math.abs(viewDistance.y % 2), 1 - Math.abs(viewDistance.z % 2), new Vector3i()); BlockRegion newPossiblyLoadedRegion = new BlockRegion(newCenter).expand(viewDistance); - BlockRegion newProbablyLoadedRegion = new BlockRegion(newPossiblyLoadedRegion).expand(-1, -1, -1); + BlockRegion newProbablyLoadedRegion = new BlockRegion(newPossiblyLoadedRegion).expand(-1, -1, -1); BlockRegion[] newLodRegions = new BlockRegion[newChunkLods == 0 ? 0 : 1 + newChunkLods]; while (chunks.size() < newLodRegions.length) { chunks.add(new ConcurrentHashMap<>()); @@ -163,7 +173,9 @@ public void updateRenderableRegion(ViewDistance newViewDistance, int newChunkLod if (i == 0) { newLodRegions[i] = new BlockRegion(newPossiblyLoadedRegion); } else { - // By making viewDistance odd, we ensure that every time a chunk boundary is crossed, at most a single lodRegion changes (except possibly for lodRegions[0], which is more closely tied to the renderable region). + // By making viewDistance odd, we ensure that every time a chunk boundary is crossed, at most a single + // lodRegion changes (except possibly for lodRegions[0], which is more closely tied to the renderable + // region). newLodRegions[i] = new BlockRegion(scaleDown(center, i)).expand(altViewDistance); } Vector3i min = newLodRegions[i].getMin(new Vector3i()); @@ -179,7 +191,9 @@ public void updateRenderableRegion(ViewDistance newViewDistance, int newChunkLod Set previouslyRequiredChunks = new HashSet<>(requiredChunks.keySet()); for (Vector3ic pos : previouslyRequiredChunks) { int scale = requiredChunks.get(pos); - boolean gone = false; // Whether this entry in requiredChunks should be removed entirely (i.e. the chunk at the actually required scale is not at this position). + // Whether this entry in requiredChunks should be removed entirely (i.e. the chunk at the actually + // required scale is not at this position). + boolean gone = false; boolean increased = false; while (scale < newLodRegions.length && !gone && !newLodRegions[scale].contains(scaleDown(pos, scale))) { LodChunk chunk = chunks.get(scale).get(new Vector3i(pos)); @@ -209,9 +223,9 @@ public void updateRenderableRegion(ViewDistance newViewDistance, int newChunkLod for (int scale = 0; scale < newLodRegions.length; scale++) { for (Vector3ic pos : newLodRegions[scale]) { if ( - scale == 0 && newProbablyLoadedRegion.contains(pos) - || scale == 0 && newPossiblyLoadedRegion.contains(pos) && chunkProvider.isChunkReady(pos) - || scale > 0 && newLodRegions[scale - 1].contains(pos.mul(2, new Vector3i())) + scale == 0 && newProbablyLoadedRegion.contains(pos) + || scale == 0 && newPossiblyLoadedRegion.contains(pos) && chunkProvider.isChunkReady(pos) + || scale > 0 && newLodRegions[scale - 1].contains(pos.mul(2, new Vector3i())) ) { continue; } diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java index 52dede49c99..4dad0f21972 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/BeforeChunkUnload.java @@ -7,8 +7,6 @@ import org.joml.Vector3ic; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class BeforeChunkUnload implements Event { private Vector3i chunkPos = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java index df124907a30..8bce8e10051 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkGenerated.java @@ -6,8 +6,6 @@ import org.joml.Vector3ic; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class OnChunkGenerated implements Event { private Vector3i chunkPos = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java index 8b9eebf38fc..a3fdfa40dd0 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/OnChunkLoaded.java @@ -7,8 +7,6 @@ import org.joml.Vector3ic; import org.terasology.engine.entitySystem.event.Event; -/** - */ public class OnChunkLoaded implements Event { private Vector3i chunkPos = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java index bef90c15dc0..fa02d4bd5e6 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkBlockIteratorImpl.java @@ -9,8 +9,6 @@ import org.terasology.engine.world.block.BlockManager; import org.terasology.engine.world.chunks.ChunkBlockIterator; -/** - */ public class ChunkBlockIteratorImpl implements ChunkBlockIterator { private final Vector3i worldOffset = new Vector3i(); diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java index 523db0f2935..ffda387cb22 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkRelevanceRegion.java @@ -18,8 +18,6 @@ import java.util.Iterator; import java.util.Set; -/** - */ public class ChunkRelevanceRegion { private EntityRef entity; private Vector3i relevanceDistance = new Vector3i(); @@ -37,7 +35,7 @@ public ChunkRelevanceRegion(EntityRef entity, Vector3ic relevanceDistance) { LocationComponent loc = entity.getComponent(LocationComponent.class); - if (loc == null||Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { + if (loc == null || Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { dirty = false; } else { center.set(Chunks.toChunkPos(loc.getWorldPosition(new Vector3f()), new Vector3i())); @@ -109,7 +107,7 @@ public void update() { private BlockRegion calculateRegion() { LocationComponent loc = entity.getComponent(LocationComponent.class); - if (loc != null&& !Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { + if (loc != null && !Float.isNaN(loc.getWorldPosition(new Vector3f()).x)) { Vector3i extents = new Vector3i(relevanceDistance.x / 2, relevanceDistance.y / 2, relevanceDistance.z / 2); return new BlockRegion(Chunks.toChunkPos(loc.getWorldPosition(new Vector3f()), new Vector3i())).expand(extents); } diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java index b17d05922b6..ff70a97e914 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/internal/ChunkSerializer.java @@ -17,8 +17,6 @@ import org.terasology.engine.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunks; -/** - */ public final class ChunkSerializer { private ChunkSerializer() { diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java b/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java index e02263c8f17..57ccc732baa 100644 --- a/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java +++ b/engine/src/main/java/org/terasology/engine/world/chunks/localChunkProvider/ChunkUnloadRequest.java @@ -5,8 +5,6 @@ import org.terasology.engine.utilities.concurrency.Task; import org.terasology.engine.world.chunks.Chunk; -/** - */ public class ChunkUnloadRequest implements Task { private Chunk chunk; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java b/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java index ff814478232..c1bd50f5a1f 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/FacetBorder.java @@ -5,8 +5,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - */ @Retention(RetentionPolicy.RUNTIME) public @interface FacetBorder { int top() default 0; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java b/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java index 74282660952..a27be09922d 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/FacetProvider.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generation; -/** - */ public interface FacetProvider { /** diff --git a/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java b/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java index e80b2dfae02..edeeccb2bdd 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/GeneratingRegion.java @@ -4,8 +4,6 @@ import org.terasology.engine.world.block.BlockRegion; -/** - */ public interface GeneratingRegion { BlockRegion getRegion(); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Produces.java b/engine/src/main/java/org/terasology/engine/world/generation/Produces.java index 3b214f46317..43d49420432 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Produces.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Produces.java @@ -7,8 +7,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface Produces { diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Region.java b/engine/src/main/java/org/terasology/engine/world/generation/Region.java index 98852027157..73e5a554a66 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Region.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Region.java @@ -4,8 +4,6 @@ import org.terasology.engine.world.block.BlockRegion; -/** - */ public interface Region { T getFacet(Class dataType); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java b/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java index 95b295427ef..8684ccb668c 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/RegionImpl.java @@ -11,8 +11,6 @@ import java.util.Map; import java.util.Set; -/** - */ public class RegionImpl implements Region, GeneratingRegion { private final BlockRegion region; @@ -24,7 +22,9 @@ public class RegionImpl implements Region, GeneratingRegion { private final Set processedProviders = Sets.newHashSet(); private final ClassToInstanceMap generatedFacets = MutableClassToInstanceMap.create(); - public RegionImpl(BlockRegion region, ListMultimap, FacetProvider> facetProviderChains, Map, Border3D> borders, float scale) { + public RegionImpl(BlockRegion region, + ListMultimap, FacetProvider> facetProviderChains, Map, Border3D> borders, float scale) { this.region = region; this.facetProviderChains = facetProviderChains; this.borders = borders; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/Updates.java b/engine/src/main/java/org/terasology/engine/world/generation/Updates.java index e152656014c..c97fa7bd213 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/Updates.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/Updates.java @@ -7,8 +7,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface Updates { diff --git a/engine/src/main/java/org/terasology/engine/world/generation/World.java b/engine/src/main/java/org/terasology/engine/world/generation/World.java index 5af41a70768..ae24ebd43ed 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/World.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/World.java @@ -7,8 +7,6 @@ import java.util.Set; -/** - */ public interface World { Region getWorldData(BlockRegion region, float scale); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java index 8fcb39bb9ee..7a9f6a3945c 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java @@ -24,8 +24,6 @@ import java.util.Set; import java.util.stream.Collectors; -/** - */ public class WorldBuilder extends ProviderStore { private static final Logger logger = LoggerFactory.getLogger(WorldBuilder.class); @@ -94,17 +92,18 @@ public World build() { List orderedRasterizers = ensureRasterizerOrdering(providerChains, false); List scalableRasterizers = ensureRasterizerOrdering(scalableProviderChains, true); return new WorldImpl( - providerChains, - scalableProviderChains, - orderedRasterizers, - scalableRasterizers, - entityProviders, - determineBorders(providerChains, orderedRasterizers), - seaLevel + providerChains, + scalableProviderChains, + orderedRasterizers, + scalableRasterizers, + entityProviders, + determineBorders(providerChains, orderedRasterizers), + seaLevel ); } - private Map, Border3D> determineBorders(ListMultimap, FacetProvider> providerChains, List worldRasterizers) { + private Map, Border3D> determineBorders(ListMultimap, + FacetProvider> providerChains, List worldRasterizers) { List orderedProviders = new ArrayList<>(); for (Class facet : providerChains.keySet()) { for (FacetProvider provider : providerChains.get(facet)) { @@ -201,7 +200,9 @@ private ListMultimap, FacetProvider> determineProvid return result; } - private void determineProviderChainFor(Class facet, ListMultimap, FacetProvider> result, boolean scalable) { + private void determineProviderChainFor(Class facet, + ListMultimap, FacetProvider> result, + boolean scalable) { if (result.containsKey(facet)) { return; } @@ -357,7 +358,9 @@ private List ensureRasterizerOrdering(ListMultimap orderedRasterizers, WorldRasterizer rasterizer, ListMultimap, FacetProvider> providerChains, boolean scalable) { + private void tryAddRasterizer(List orderedRasterizers, WorldRasterizer rasterizer, + ListMultimap, FacetProvider> providerChains, + boolean scalable) { if (scalable && !(rasterizer instanceof ScalableWorldRasterizer)) { return; } diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java index 4eeee714912..4da1dbd7d8e 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generation; -/** - */ public interface WorldFacet { } diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java index 5fbdaa1bf6c..e532bdedcbf 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet2D.java @@ -4,8 +4,6 @@ import org.terasology.engine.world.block.BlockAreac; -/** - */ public interface WorldFacet2D extends WorldFacet { /** diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java index b8bf39e6814..bad0960c58e 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldFacet3D.java @@ -4,8 +4,6 @@ import org.terasology.engine.world.block.BlockRegionc; -/** - */ public interface WorldFacet3D extends WorldFacet { /** diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java index 2f3badf6d40..4cc9eb2c8c3 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldImpl.java @@ -13,8 +13,6 @@ import java.util.Map; import java.util.Set; -/** - */ public class WorldImpl implements World { private final ListMultimap, FacetProvider> facetProviderChains; private final ListMultimap, FacetProvider> scalableFacetProviderChains; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java b/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java index d2edb7d3352..8e93d2f1f92 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/WorldRasterizer.java @@ -4,8 +4,6 @@ import org.terasology.engine.world.chunks.Chunk; -/** - */ public interface WorldRasterizer { void initialize(); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java index de7f7667001..340cc80c989 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/DensityFacet.java @@ -6,8 +6,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; -/** - */ public class DensityFacet extends BaseFieldFacet3D { public DensityFacet(BlockRegionc targetRegion, Border3D border) { diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java index 9244f7aa19a..482a9abda45 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/SurfaceTemperatureFacet.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.generation.Border3D; import org.terasology.engine.world.generation.FacetName; -/** - */ @FacetName("Temperature") public class SurfaceTemperatureFacet extends BaseFieldFacet2D { static int maxSamplesPerRegion = 5; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java index ddbc7c12847..113c6f1c853 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseBooleanFieldFacet3D.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.block.BlockRegion; import org.terasology.engine.world.generation.Border3D; -/** - */ public abstract class BaseBooleanFieldFacet3D extends BaseFacet3D implements BooleanFieldFacet3D { private boolean[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java index 0089b53b633..8bab9f49381 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet2D.java @@ -9,8 +9,6 @@ import org.terasology.engine.world.generation.Border3D; import org.terasology.engine.world.generation.WorldFacet2D; -/** - */ public class BaseFacet2D implements WorldFacet2D { private BlockArea worldRegion; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java index cb52360c7d1..3b0ba0cea84 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFacet3D.java @@ -8,8 +8,6 @@ import org.terasology.engine.world.generation.Border3D; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public class BaseFacet3D implements WorldFacet3D { private BlockRegion worldRegion; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java index 9468f5e0387..c960c520673 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet2D.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; -/** - */ public abstract class BaseFieldFacet2D extends BaseFacet2D implements FieldFacet2D { private float[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java index fb3f1ea5971..99ac0707078 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseFieldFacet3D.java @@ -7,8 +7,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.generation.Border3D; -/** - */ public abstract class BaseFieldFacet3D extends BaseFacet3D implements FieldFacet3D { private float[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java index 9ff89b00ac7..657e60d95b4 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BaseObjectFacet2D.java @@ -9,8 +9,6 @@ import java.lang.reflect.Array; -/** - */ public abstract class BaseObjectFacet2D extends BaseFacet2D implements ObjectFacet2D { private T[] data; diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java index 5899e179b84..dbe95ee5766 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/BooleanFieldFacet3D.java @@ -5,8 +5,6 @@ import org.joml.Vector3ic; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public interface BooleanFieldFacet3D extends WorldFacet3D { boolean get(int x, int y, int z); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java index c12aa6d7a9f..25c58668d20 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet2D.java @@ -5,8 +5,6 @@ import org.joml.Vector2ic; import org.terasology.engine.world.generation.WorldFacet2D; -/** - */ public interface FieldFacet2D extends WorldFacet2D { float get(int x, int y); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java index d683a73b73e..8d61878481a 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/FieldFacet3D.java @@ -5,8 +5,6 @@ import org.joml.Vector3ic; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public interface FieldFacet3D extends WorldFacet3D { float get(int x, int y, int z); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java index 09132038e56..ccbd94ecb78 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet2D.java @@ -5,8 +5,6 @@ import org.joml.Vector2ic; import org.terasology.engine.world.generation.WorldFacet2D; -/** - */ public interface ObjectFacet2D extends WorldFacet2D { T get(int x, int y); diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java index 54b3a310130..02e2cac161b 100644 --- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java +++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/ObjectFacet3D.java @@ -5,8 +5,6 @@ import org.joml.Vector3ic; import org.terasology.engine.world.generation.WorldFacet3D; -/** - */ public interface ObjectFacet3D extends WorldFacet3D { T get(int x, int y, int z); diff --git a/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java b/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java index 54945cd555d..81d64ea7616 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/ChunkGenerationPass.java @@ -7,8 +7,6 @@ import java.util.Map; -/** - */ public interface ChunkGenerationPass { void setWorldSeed(String seed); diff --git a/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java b/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java index 7bb36730d2b..db33afd4d73 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/UnresolvedWorldGeneratorException.java @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generator; -/** - */ public class UnresolvedWorldGeneratorException extends Exception { private static final long serialVersionUID = 2096504461776129337L; diff --git a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java index 9deea3517b9..ed98c84507a 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorInfo.java @@ -6,8 +6,6 @@ import java.util.Objects; -/** - */ public class WorldGeneratorInfo implements Comparable { private SimpleUri uri; diff --git a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java index 619d3267481..25c2c6452c0 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/internal/WorldGeneratorManager.java @@ -25,8 +25,6 @@ import static com.google.common.base.Verify.verifyNotNull; -/** - */ public class WorldGeneratorManager { private static final Logger logger = LoggerFactory.getLogger(WorldGeneratorManager.class); diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java index e4fefaeceb8..10ef092fe41 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/DefaultWorldGeneratorPluginLibrary.java @@ -14,8 +14,6 @@ import java.util.List; -/** - */ public class DefaultWorldGeneratorPluginLibrary implements WorldGeneratorPluginLibrary { private final ClassLibrary library; @@ -24,7 +22,8 @@ public DefaultWorldGeneratorPluginLibrary(ModuleEnvironment moduleEnvironment, C library = new DefaultModuleClassLibrary<>(moduleEnvironment, context.get(ReflectFactory.class), context.get(CopyStrategyLibrary.class)); for (Class entry : moduleEnvironment.getTypesAnnotatedWith(RegisterPlugin.class)) { if (WorldGeneratorPlugin.class.isAssignableFrom(entry)) { - library.register(new ResourceUrn(moduleEnvironment.getModuleProviding(entry).toString(), entry.getSimpleName()).toString(), entry.asSubclass(WorldGeneratorPlugin.class)); + ResourceUrn resourceUrn = new ResourceUrn(moduleEnvironment.getModuleProviding(entry).toString(), entry.getSimpleName()); + library.register(resourceUrn.toString(), entry.asSubclass(WorldGeneratorPlugin.class)); } } } diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java index f6af70b2e56..6b31dad89d7 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java @@ -7,8 +7,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RegisterPlugin { diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java index cc4e260a3ab..992ac9b5bf9 100644 --- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java +++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/WorldGeneratorPlugin.java @@ -2,7 +2,5 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.engine.world.generator.plugin; -/** - */ public interface WorldGeneratorPlugin { } diff --git a/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java b/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java index 9a114b4519f..7467c9094cd 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/AbstractWorldProviderDecorator.java @@ -13,8 +13,6 @@ import java.util.Collection; import java.util.Map; -/** - */ public class AbstractWorldProviderDecorator implements WorldProviderCore { private WorldProviderCore base; diff --git a/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java b/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java index 9a0aa941f10..38058b3b019 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/ChunkViewCoreImpl.java @@ -14,8 +14,6 @@ import org.terasology.engine.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunks; -/** - */ public class ChunkViewCoreImpl implements ChunkViewCore { private static final Logger logger = LoggerFactory.getLogger(ChunkViewCoreImpl.class); diff --git a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java index 4df0d31aff0..0db21115845 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderCoreImpl.java @@ -44,9 +44,7 @@ import java.util.Map; import java.util.Set; -/** - * - */ + public class WorldProviderCoreImpl implements WorldProviderCore { private String title; diff --git a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java index a2180aa3354..205f7193b8f 100644 --- a/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java +++ b/engine/src/main/java/org/terasology/engine/world/internal/WorldProviderWrapper.java @@ -15,8 +15,6 @@ import java.util.Collection; -/** - */ public class WorldProviderWrapper extends AbstractWorldProviderDecorator implements WorldProvider { private WorldProviderCore core; private ExtraBlockDataManager extraDataManager; diff --git a/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java b/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java index ec4e92a44a0..6e392b7eb95 100644 --- a/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java +++ b/engine/src/main/java/org/terasology/engine/world/time/WorldTime.java @@ -4,8 +4,6 @@ import org.terasology.engine.entitySystem.systems.ComponentSystem; -/** - */ public interface WorldTime extends ComponentSystem { /** diff --git a/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java b/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java index d2165a822f9..8f87777bdcc 100644 --- a/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java +++ b/engine/src/main/java/org/terasology/engine/world/time/WorldTimeImpl.java @@ -12,8 +12,6 @@ import java.util.concurrent.atomic.AtomicLong; -/** - */ public class WorldTimeImpl extends BaseComponentSystem implements WorldTime, UpdateSubscriberSystem { private static final float WORLD_TIME_MULTIPLIER = 48f; diff --git a/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java b/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java index e6a0b4333a3..664b9dc50a0 100644 --- a/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java +++ b/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java @@ -23,5 +23,5 @@ public interface LayerThickness { * * @param parent the layer this is attached to */ - default void initialize(LayeredZoneRegionFunction parent) {} + default void initialize(LayeredZoneRegionFunction parent) { } } diff --git a/engine/src/main/java/org/terasology/engine/world/zones/Zone.java b/engine/src/main/java/org/terasology/engine/world/zones/Zone.java index 1f6577ad3f3..4c75742c498 100644 --- a/engine/src/main/java/org/terasology/engine/world/zones/Zone.java +++ b/engine/src/main/java/org/terasology/engine/world/zones/Zone.java @@ -118,7 +118,7 @@ public void generateChunk(Chunk chunk, Region chunkRegion) { //Save the blocks that aren't in the zone for (int x = 0; x < Chunks.SIZE_X; x++) { - for (int y = 0; y { diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java index 7ccda116a21..82e4f1b07c2 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/PropertyProvider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.properties; import java.util.List; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java index 36d90209be6..9165b0853c6 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/ReflectionProvider.java @@ -1,24 +1,10 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.properties; import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.context.Context; import org.terasology.nui.properties.Range; import org.terasology.reflection.copy.CopyStrategyLibrary; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java b/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java index e770537afe8..515e43369a6 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/properties/SceneProperties.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.properties; import com.google.common.collect.Lists; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java index c1e1256600a..c2c6d5f4d2d 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/AwtInput.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.subsystem; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java index ebae5893f77..e386179c502 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortlet.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.subsystem; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java index cd78fcc9df2..a0fe9ec2b66 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/subsystem/LwjglPortletDisplayDevice.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.subsystem; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java index 958a2a180ab..0189c071437 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/MainWindow.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.slf4j.Logger; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java index 258e1904065..1499b03edfe 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertyPanel.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.terasology.editor.properties.FloatProperty; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java index dbd7f6fa90b..28eb12f2922 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/PropertySlider.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.terasology.editor.properties.FloatProperty; diff --git a/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java b/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java index 7eeafd5a205..0d51a349df1 100644 --- a/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java +++ b/facades/TeraEd/src/main/java/org/terasology/editor/ui/Viewport.java @@ -1,18 +1,5 @@ -/* - * Copyright 2013 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.editor.ui; import org.lwjgl.opengl.awt.AWTGLCanvas; diff --git a/subsystems/DiscordRPC/build.gradle.kts b/subsystems/DiscordRPC/build.gradle.kts index e0d2b686125..df6cd5c98cc 100644 --- a/subsystems/DiscordRPC/build.gradle.kts +++ b/subsystems/DiscordRPC/build.gradle.kts @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 plugins { diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java index 3ed3c9654fe..45b677a1508 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.subsystem.discordrpc; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java index 85d5644fa92..72155a4dd9e 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.subsystem.discordrpc; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java index 89b67ddb9c5..663c1499ab8 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.subsystem.discordrpc; @@ -254,14 +254,17 @@ private RichPresence build() { RichPresence.Builder builder = new RichPresence.Builder() .setLargeImage(DISCORD_APP_DEFAULT_IMAGE); - if (buffer.getDetails() != null) + if (buffer.getDetails() != null) { builder.setDetails(buffer.getDetails()); + } - if (buffer.getState() != null) + if (buffer.getState() != null) { builder.setState(buffer.getState()); + } - if (buffer.getStartTimestamp() != null) + if (buffer.getStartTimestamp() != null) { builder.setStartTimestamp(buffer.getStartTimestamp()); + } int partySize = buffer.getPartySize(); int partyMax = buffer.getPartyMax(); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java index 6692ea01b2e..ac1dccf8e6e 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/DeserializeFieldCheck.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java index 9f9139cd25d..13374d77c71 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataReader.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java index 82a072072bc..000b07cafe6 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/PersistedDataWriter.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java index 9294c5f4ae3..e4a0586cc04 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/Serializer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.serializers; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java index a750525b353..453f5182f88 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/DeserializationException.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java index aad114b714e..066bbdf48b2 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/FutureTypeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java index 0c4bb329971..6bedaa1189f 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/InstanceCreator.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java index 9646e4571e5..969e46fc35c 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedData.java @@ -1,12 +1,10 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; import java.nio.ByteBuffer; -/** - */ public interface PersistedData { /** diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java index 587b6ae1061..e8dbcac24c4 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataArray.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; @@ -9,8 +9,6 @@ import java.util.List; -/** - */ public interface PersistedDataArray extends PersistedData, Iterable { int size(); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java index f467939ecab..ad7f68aa6c3 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java @@ -7,8 +7,6 @@ import java.util.Map; import java.util.Set; -/** - */ public interface PersistedDataMap extends PersistedData { boolean has(String name); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java index 81b9665677c..2b35ef3fa19 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/PersistedDataSerializer.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; @@ -10,9 +10,7 @@ import java.nio.ByteBuffer; import java.util.Map; -/** - * - */ + public interface PersistedDataSerializer { /** diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java index c35117489be..217941e952a 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SerializationException.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java index 8ed561245f2..1abf8c993b9 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/SpecificTypeHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java index 57dd3977240..5d4ea3f0596 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/StringRepresentationTypeHandler.java @@ -1,11 +1,9 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; import java.util.Optional; -/** - */ public abstract class StringRepresentationTypeHandler extends TypeHandler { public abstract String getAsString(T item); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java index 3302bed812c..ac165f48ee8 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java index 32244257875..e339b4edc29 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java index 1c320f87dd2..da70bc2d0e7 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/annotations/SerializedName.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.annotations; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java index 863250db661..72aa0ae9551 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/BooleanTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class BooleanTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java index 0bd9c3f8151..73dce252c0a 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ByteTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class ByteTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java index 2e38349dcd0..dcaf93d77b5 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/DoubleTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class DoubleTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java index 1ba03c336f9..cd0bc4ba319 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/EnumTypeHandler.java @@ -13,8 +13,6 @@ import java.util.Map; import java.util.Optional; -/** - */ public class EnumTypeHandler extends TypeHandler { private static final Logger logger = LoggerFactory.getLogger(EnumTypeHandler.class); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java index e5787c873e8..e0e8ead82b0 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/FloatTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class FloatTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java index 8b25701e7fb..d26800dfad5 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/IntTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class IntTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java index 9dac8fd9980..fcc4677f5f3 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/LongTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class LongTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java index 24950c1e51e..12fe8a47b08 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/NumberTypeHandler.java @@ -9,8 +9,6 @@ import java.util.Optional; -/** - */ public class NumberTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java index cc7436566f1..fadf27e74a4 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringMapTypeHandler.java @@ -10,8 +10,6 @@ import java.util.Map; import java.util.Optional; -/** - */ public class StringMapTypeHandler extends TypeHandler> { private TypeHandler contentsHandler; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java index 6b6e81728de..6e1f6ea5855 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/coreTypes/StringTypeHandler.java @@ -8,8 +8,6 @@ import java.util.Optional; -/** - */ public class StringTypeHandler extends TypeHandler { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java index f30762962c4..e40a230b229 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/AbstractPersistedData.java @@ -9,8 +9,6 @@ import java.nio.ByteBuffer; -/** - */ public abstract class AbstractPersistedData implements PersistedData { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java index 38f2159d960..d5942e444c1 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBoolean.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedBoolean extends AbstractPersistedData { private boolean data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java index 06aaeeefd0b..3585432edff 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedBytes.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java index f4f1e8d3a16..cfc3ac5ab2f 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedDouble.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedDouble extends PersistedNumber { private double data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java index fb3dee2bd3c..9c6253e0098 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedFloat.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedFloat extends PersistedNumber { private float data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java index 323a4b9af8c..b3578f79eeb 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedInteger.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedInteger extends PersistedNumber { private int data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java index 5a5954ae99a..09cda783922 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedLong.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedLong extends PersistedNumber { private long data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java index 821e173f115..f114b3320e1 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedMap.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Set; -/** - */ public class PersistedMap extends AbstractPersistedData implements PersistedDataMap { private Map map; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java index 02ea3f051e3..b1fae536f00 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedNumber.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public abstract class PersistedNumber extends AbstractPersistedData { @Override diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java index 2518f4712df..8a33b8cc7c7 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/PersistedString.java @@ -1,9 +1,7 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory; -/** - */ public class PersistedString extends AbstractPersistedData { private String data; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java index 757870988f3..4cb2358a9d1 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedNumberArray.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.persistence.typeHandling.inMemory.arrays; diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java index 32a41d10720..dec69e8d53c 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/inMemory/arrays/PersistedValueArray.java @@ -68,7 +68,7 @@ public int getAsInteger() { if (persistedData.isNumber()) { return persistedData.getAsInteger(); } else { - throw new ClassCastException("Data is not a Integer" ); + throw new ClassCastException("Data is not a Integer"); } } else { throw new IllegalStateException("Data is an array of size != 1"); diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java index 405e40af1e8..8712133300f 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 /** diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java index 8649ece6762..229bc7922ca 100644 --- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java +++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/reflection/reflect/CollectionCopyConstructor.java @@ -1,18 +1,5 @@ -/* - * Copyright 2019 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.reflection.reflect; import java.util.Collection; diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java index 238e772c253..39f9702696a 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/FutureTypeHandlerTest.java @@ -56,16 +56,16 @@ public void testRecursiveType() { ResultCaptor>>> resultCaptor = new ResultCaptor<>(); doAnswer(resultCaptor).when(typeHandlerLibrary).getTypeHandler( - eq(new TypeInfo>() {}.getType()) + eq(new TypeInfo>() { }.getType()) ); TypeHandler> typeHandler = typeHandlerLibrary.getTypeHandler( - new TypeInfo>() {} + new TypeInfo>() { } ).get(); verify(typeHandlerLibrary, times(1)).getTypeHandler( - eq(new TypeInfo>() {}.getType()) + eq(new TypeInfo>() { }.getType()) ); // Optional#get() can throw NoSuchElementException diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java index 5e8eb3deb12..6d027341def 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryTest.java @@ -33,7 +33,7 @@ public static void setup() { } @MappedContainer - private static class AMappedContainer {} + private static class AMappedContainer { } @Test public void testMappedContainerHandler() { @@ -45,17 +45,17 @@ public void testMappedContainerHandler() { @Test public void testCollectionHandler() { TypeHandler> setHandler = - typeHandlerLibrary.getTypeHandler(new TypeInfo>() {}).get(); + typeHandlerLibrary.getTypeHandler(new TypeInfo>() { }).get(); assertTrue(setHandler instanceof CollectionTypeHandler); TypeHandler> listHandler = - typeHandlerLibrary.getTypeHandler(new TypeInfo>() {}).get(); + typeHandlerLibrary.getTypeHandler(new TypeInfo>() { }).get(); assertTrue(listHandler instanceof CollectionTypeHandler); TypeHandler> queueHandler = - typeHandlerLibrary.getTypeHandler(new TypeInfo>() {}).get(); + typeHandlerLibrary.getTypeHandler(new TypeInfo>() { }).get(); assertTrue(queueHandler instanceof CollectionTypeHandler); } @@ -92,5 +92,5 @@ void testGetBaseTypeHandler() { assertTrue(handler instanceof RuntimeDelegatingTypeHandler); } - private enum AnEnum {} + private enum AnEnum { } } diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java index 7640d1f5812..457b6c1703b 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandlerTest.java @@ -54,7 +54,7 @@ private void setupHandlers() { subType = Sub.class; baseType = TypeInfo.of(Base.class).getType(); - abstract class SubHandler extends TypeHandler {} + abstract class SubHandler extends TypeHandler { } baseTypeHandler = mockTypeHandler(); subTypeHandler = mockTypeHandler(SubHandler.class); @@ -129,8 +129,8 @@ void testSerializeSub() { argThat((ArgumentMatcher>) argument -> { return argument.get(RuntimeDelegatingTypeHandler.TYPE_FIELD) .getAsString() - .equals(subType.getName()) && - argument.containsKey(RuntimeDelegatingTypeHandler.VALUE_FIELD); + .equals(subType.getName()) + && argument.containsKey(RuntimeDelegatingTypeHandler.VALUE_FIELD); }) ); } diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java index d7c3352c562..38144a56790 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ArrayTypeHandlerFactoryTest.java @@ -41,7 +41,7 @@ void testArray() { @Test void testGenericArray() { - TypeInfo[]> arrayTypeInfo = new TypeInfo[]>() {}; + TypeInfo[]> arrayTypeInfo = new TypeInfo[]>() { }; Optional[]>> typeHandler = typeHandlerFactory.create(arrayTypeInfo, context); @@ -50,12 +50,12 @@ void testGenericArray() { assertTrue(typeHandler.get() instanceof ArrayTypeHandler); // Verify that the List TypeHandler was loaded from the TypeHandlerLibrary - verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() {}.getType())); + verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() { }.getType())); } @Test void testNonArray() { - TypeInfo> arrayTypeInfo = new TypeInfo>() {}; + TypeInfo> arrayTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(arrayTypeInfo, context); diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java index 16fefdd046f..1be029d43cb 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/CollectionTypeHandlerFactoryTest.java @@ -32,7 +32,7 @@ public class CollectionTypeHandlerFactoryTest { @Test public void testList() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -46,7 +46,7 @@ public void testList() { @Test public void testSet() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -60,7 +60,7 @@ public void testSet() { @Test public void testQueue() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -74,7 +74,7 @@ public void testQueue() { @Test public void testNonGenericCollection() { - class IntList extends ArrayList {} + class IntList extends ArrayList { } Optional> typeHandler = typeHandlerFactory.create(TypeInfo.of(IntList.class), context); diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java index f2b73d4a0ee..311e587396f 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/MapTypeHandlerFactoryTest.java @@ -31,7 +31,7 @@ class MapTypeHandlerFactoryTest { @Test void testStringMap() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -45,7 +45,7 @@ void testStringMap() { @Test void testNonStringMap() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); @@ -55,7 +55,7 @@ void testNonStringMap() { @Test void testNonGenericMap() { - class IntMap extends HashMap {} + class IntMap extends HashMap { } Optional> typeHandler = typeHandlerFactory.create(TypeInfo.of(IntMap.class), context); @@ -70,7 +70,7 @@ class IntMap extends HashMap {} @Test void testGenericMap() { - TypeInfo> listTypeInfo = new TypeInfo>() {}; + TypeInfo> listTypeInfo = new TypeInfo>() { }; Optional>> typeHandler = typeHandlerFactory.create(listTypeInfo, context); diff --git a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java index 5c180ac50be..3451b19d965 100644 --- a/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java +++ b/subsystems/TypeHandlerLibrary/src/test/java/org/terasology/persistence/typeHandling/coreTypes/factories/ObjectFieldMapTypeHandlerFactoryTest.java @@ -38,7 +38,7 @@ private static class SomeClass { @Test public void testObject() { Optional>> typeHandler = - typeHandlerFactory.create(new TypeInfo>() {}, context); + typeHandlerFactory.create(new TypeInfo>() { }, context); assertTrue(typeHandler.isPresent()); assertTrue(typeHandler.get() instanceof ObjectFieldMapTypeHandler); @@ -46,6 +46,6 @@ public void testObject() { // Verify that the Integer and List TypeHandlers were loaded from the TypeHandlerLibrary verify(typeHandlerLibrary).getTypeHandler(eq(TypeInfo.of(Integer.class).getType())); - verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() {}.getType())); + verify(typeHandlerLibrary).getTypeHandler(eq(new TypeInfo>() { }.getType())); } } diff --git a/subsystems/subprojects.settings.gradle b/subsystems/subprojects.settings.gradle index 35f4dd3d4b1..a26fa8caf62 100644 --- a/subsystems/subprojects.settings.gradle +++ b/subsystems/subprojects.settings.gradle @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 // This magically allows subdirs in this subproject to themselves become sub-subprojects in a proper tree structure