Commit Graph

24 Commits (master)

Author SHA1 Message Date
Tobias Nett 8e265d0e08
style: fix AnnotationUseStyle (#4710) 2021-05-26 15:52:56 +02:00
Tobias Nett 2d0c434654
style: improve code style (#4702)
* cleanup imports
* update copyrights
* remove empty JavaDoc
* add missing curly braces
* fix whitespaces
* fix lines longer than 175 characters

Co-authored-by: Josephine Rueckert <jd.rueckert@googlemail.com>
2021-05-24 13:50:30 +02:00
Michael Pollind e55b7f0fd7 feature: migrate to gestaltv7 2021-03-27 18:18:30 -07:00
Kevin Turner 13758b32c0 chore: update NUI to 3.0.0 from 1.5.
The gestalt-separation branch of NUI.
2021-03-23 16:24:06 -07:00
Benjamin Amos 4f1738ae3b Cleaned-up NUI API packages in ExternalApiWhitelist.
Also updated nui-reflect ClassMetadata#getUri() calls to ClassMetadata.getId().
2021-03-22 16:52:47 +00:00
Kevin Turner 439e8d97f7 Merge remote-tracking branch 'origin/develop' into feature/THL-generic-serializer
engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigSerializerTest.java
engine-tests/src/test/java/org/terasology/persistence/serializers/TypeSerializerTest.java
engine-tests/src/test/java/org/terasology/persistence/serializers/VectorTypeSerializerTest.java
engine-tests/src/test/java/org/terasology/persistence/typeHandling/mathTypes/BlockAreaTypeHandlerTest.java
engine/src/main/java/org/terasology/config/flexible/AutoConfigManager.java
engine/src/main/java/org/terasology/config/flexible/AutoConfigSerializer.java
engine/src/main/java/org/terasology/engine/subsystem/common/ConfigurationSubsystem.java
engine/src/main/java/org/terasology/persistence/serializers/GsonSerializer.java
engine/src/main/java/org/terasology/persistence/serializers/ProtobufSerializer.java
engine/src/main/java/org/terasology/recording/RecordedEventSerializer.java
subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/serializers/AbstractSerializer.java
2021-03-10 12:16:14 -08:00
Kevin Turner 8dbe797b1a Merge remote-tracking branch 'origin/develop' into chore/move-in-place
engine-tests/src/test/java/org/terasology/config/flexible/internal/SettingImplTest.java
engine/src/main/java/org/terasology/config/flexible/SettingArgument.java
engine/src/main/java/org/terasology/config/flexible/internal/SettingBuilder.java
engine/src/main/java/org/terasology/config/flexible/internal/SettingImpl.java
engine/src/main/java/org/terasology/config/flexible/internal/SettingImplBuilder.java
engine/src/main/java/org/terasology/engine/modes/StateLoading.java
engine/src/main/java/org/terasology/engine/modes/loadProcesses/InitialiseWorld.java
engine/src/main/java/org/terasology/engine/subsystem/common/MonitoringSubsystem.java
engine/src/main/java/org/terasology/i18n/TranslationSystemImpl.java
engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java
engine/src/main/java/org/terasology/logic/console/commands/ServerCommands.java
engine/src/main/java/org/terasology/logic/players/DebugControlSystem.java
engine/src/main/java/org/terasology/persistence/internal/ReadWriteStorageManager.java
engine/src/main/java/org/terasology/rendering/nui/editor/layers/NUIEditorSettingsScreen.java
engine/src/main/java/org/terasology/rendering/nui/layers/ingame/metrics/DebugOverlay.java
engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/settings/PlayerSettingsScreen.java
engine/src/main/java/org/terasology/telemetry/metrics/GameConfigurationMetric.java
2021-03-09 13:02:48 -08:00
Nail Khanipov 717605a16d
feature(autoconfig): migrate SystemConfig (#4235) 2021-03-09 21:34:08 +01:00
Kevin Turner 3ffe5fe794 Merge remote-tracking branch 'origin/develop' into chore/move-in-place 2021-03-07 13:09:14 -08:00
Kevin Turner 1b38e35c0a
chore: upgrade reflections to 0.9.12-MB from 0.9.10 (#4564)
Using the org.terasology fork.

Co-authored-by: Michael Pollind <polli104@mail.chapman.edu>
2021-03-07 07:48:29 -08:00
Michael Pollind 00c80a3f4c Merge remote-tracking branch 'origin/develop' into feature/THL-generic-serializer 2021-03-06 13:02:28 -08:00
Kevin Turner 66e5f5d868 refactor! move engine code in to org.terasology.engine package
Packages that were formerly org.terasology.engine are now
org.terasology.engine.core.
2021-03-04 21:45:23 -08:00
Nail Khanipov 2b760c7336
fix(ConstructorLibrary): prevent AccessControlException by using `AccessController.doPrivilaged` (#4552) 2021-03-01 21:21:30 +01:00
DarkWeird 7b6a72f0e3 Merge remote-tracking branch 'origin/develop' into feature/THL-deserialization
# Conflicts:
#	.idea/compiler.xml
#	engine-tests/src/test/java/org/terasology/persistence/serializers/TypeSerializerTest.java
#	engine-tests/src/test/java/org/terasology/persistence/serializers/VectorTypeSerializerTest.java
#	engine/src/main/java/org/terasology/config/flexible/AutoConfigManager.java
2021-02-26 13:24:14 +03:00
Nail Khanipov b00f1b94f9
feat: Reviving of "UI for editing arbitrary types and AutoConfigs" (#4244)
Co-authored-by: Arav Singhal <singhal.arav@gmail.com>
2021-02-25 18:33:55 +01:00
Tobias Nett 91b787cbd6
feat(TypeHandler): Add GenericMapTypeHandler for `Map<K, V>` (#4377)
* doc: add short description to GenericMapTypeHandler
* test: correct failing test
  `Map<Integer, Integer>` is no longer invalid, so I turned it into a test for checking that the generic map handler is used.
2021-01-11 11:58:48 +01:00
DarkWeird 355701da39 doc(TypeHandlerLibrary): fix code example 2020-12-18 09:26:05 +03:00
DarkWeird 050b5fa9be doc(TypeHandlerLibrary): fix code example 2020-12-18 09:06:21 +03:00
DarkWeird 305a052ee1 doc(TypeHandlerLibrary): add docs about serializer and more examples. 2020-12-17 17:39:43 +03:00
DarkWeird 3a938c1dd4 feature(TypeHandlerLibary): remove `GsonSerializer` 2020-12-16 17:02:24 +03:00
DarkWeird 4c14011483 feature(TypeHandlerLibary): Make `Serializer` class as final. integrate with `Reader` and `Writer`.
Mark `GsonSerializer` and `ProtobufSerializer` as Depricated.
2020-12-16 16:42:50 +03:00
DarkWeird c469d17d3b feature(TypeHandlerLibary): add Reader and Writer for Protobuf and Gson 2020-12-15 15:48:10 +03:00
Nail Khanipov b332d0f0b7
ci(subsystems): Make TypeHandlerLibrary publishable with engine's version (#4307) 2020-12-09 18:23:35 +01:00
Nail Khanipov fabfe79b34
feat(subsystems): extract TypeHandlerLibrary. (#4255)
* build(subsystems): fix manifest's classpath gatherning in buildscript time. (locked cache)

* feat(TypeHandlerLibrary): add PersistentDataArray implementations of `in-memory`
* feat(TypeHandlerLibrary): move most part of code from TypeHandlerLibraryImpl
* feat(TypeHandlerLibrary): split TypeHandlerLibraryTest and setup default handlers correctly
* feat(TypeHandlerLibrary): move `ConstructorLibrary`, `CollectionTypeHandlerFactory`, `OjbectFiledMapTypeHandlerFactory` and they tests  to `TypeHandlerWidget` subsystem.

* test(TypeHandlerLibrary): move tests from engine to TypEHandlerLibrary subsystem
* test(TypeHandlerLibrary): add tests for simple type handlers and byte/bytes type handlers
* test(TypeHandlerLibrary): add Test for In-memory persistent

* chore(subsystems): replace copyrigh with 2 line copyright
* chore(TypeHandlerLibrary): remove public modifiers for tests (sonarlint - junit 5 issue)
* chore(TypeHandlerLibrary): make fields private for TypeHandlerLibrary

* perf(TypeHandlerLibrary): replace mock with implementation in CharacterTypeHandlerTest

* fix(TypeHandlerLibrary): change method reference for typeHandlerLibrary.populateBuiltInHandlers
* fix(TypeHandlerLibrary): move `AbstractSerializer` to TWL subsystem.
2020-12-08 09:38:27 +01:00