Commit Graph

62 Commits (master)

Author SHA1 Message Date
Tobias Nett 5e3d63f186
chore(subsystems/discord): catch runtime exception and log only message (#5063) 2022-08-26 21:28:13 +02:00
jdrueckert f3f9d9280d
fix: do not crash on unexpected map format in GenericMapTypeHandler (#5062)
Co-authored-by: Tobias Nett <skaldarnar@googlemail.com>
2022-08-23 00:10:43 +02:00
Kevin Turner fbc40c3fe2
fix(TypeHandlerLibrary): fix error-during-error-logging in GenericMap (#5048) 2022-06-14 15:46:02 -07:00
Kevin Turner 9a122e21fb
security: upgrade dependencies (#5021)
- upgrade snowplow, logstash-logback-encoder, logback-classic, plexus-utils, protobuf-java
- remove dom4j, jetbrains NotNull annotation
2022-05-28 17:18:35 +02:00
Kevin Turner ec8decfad5 build: make terasology-common for easy inclusion of things applicable to all subprojects 2022-05-21 13:46:39 -07:00
Nail Khanipov 1f0349f4d6
feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to gestalt's (#4898) 2021-12-05 14:19:57 +01:00
Kevin Turner 4c89465897
test(TypeHandlerLibrary): RuntimeDelegatingTypeHandler test failure (#3992)
This instance of Reflections did not find the test's classes under Java 11; provide an alternate SerializationSandbox.
2021-11-07 07:52:58 -08:00
Kevin Turner 12f9baba58
test(TypeHandlerLibrary): provide a logger during test execution (#4944)
Otherwise it says “defaulting to no-operation (NOP) logger implementation” and we don't see messages that could help diagnose test failures.

Fixes #4943.
2021-11-07 09:57:24 +03:00
Kevin Turner 36e88a1a9e
test: add unitTest target to TypeHandlerLibrary and facades (#4940) 2021-11-05 15:37:28 -07:00
Kevin Turner 89242ee5cb chore: upgrade to mockito 3.11.2 from 3.7.7 2021-07-02 11:11:36 -07:00
jdrueckert e11c4f7cb5
style: fix checkstyle findings (#4781) 2021-06-20 19:50:09 +02:00
jdrueckert 7b53291de5
style: address checkstyle findings (#4758)
* resolve TypeNameCheck 
* resolve MethodTypeParameterNameCheck
* resolve MemberNameCheck 
* suppress LocalVariableNameCheck 
* resolve ClassTypeParameterNameCheck
* resolve ParameterAssignmentCheck
* suppress ParameterAssignmentCheck 
* resolve StaticVariableNameCheck
* resolve EqualsHashCodeCheck
* resolve RegexpMultilineCheck 
* resolve MethodParamPadCheck 
* suppress IllegalTypeCheck 
* resolve EmptyForIteratorPadCheck 
* resolve ArrayTypeStyleCheck 
* resolve WhitespaceAroundCheck
* resolve AnnotationUseStyleCheck
* resolve ParenPadCheck
* resolve HideUtilityClassConstructorCheck
* resolve EmptyBlockCheck
* resolve LineLengthCheck
* resolve valid MissingDeprecatedCheck
* resolve javadoc issues reported as false positives by MissingDeprecatedCheck
* resolve OperatorWrapCheck
* resolve NoWhitespaceBeforeCheck
* resolve UnusedImportsCheck
* resolve WhitespaceAfterCheck
* resolve InnerTypeLastCheck in non-test classes
* resolve DeclarationOrderCheck
* resolve FinalClassCheck
2021-06-13 12:14:49 +02:00
Kevin Turner 829aa78e5b
chore: upgrade to gestalt 7.1.0 from snapshot (#4761) 2021-06-13 01:31:38 +02:00
Tobias Nett 7619f15a11
fix: prevent NPE with DelayManager on remote clients (#4740) 2021-06-12 12:06:33 +02:00
jdrueckert d8debffed6
chore: consume TeraNUI v3 release (#4748) 2021-06-06 12:23:14 -07:00
Tobias Nett f8022aeee2
fix(DiscordRPC): NPE on shutdown (#4723) 2021-05-28 22:05:51 +02:00
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
Kevin Turner 0bd23a74f5 build: remove commented-out uses of reflections-cache 2021-04-27 14:04:18 -07:00
Kevin Turner 2b54db578a build: disable build-time cacheReflections in a more consistent way
Instead of commenting out the code in the reflection-manifest plugin, comment out its usages.

(Yes commented code is bad either way but I still feel some doubt about which way this branch is going.)
2021-04-26 11:14:33 -07:00
Kevin Turner 9204eabce1 build: factor out reflections manifest `cacheReflections` task [WIP]
…except now it can't find world generators
2021-04-11 16:45:31 -07:00
Kevin Turner d3530312fb fix(DiscordRPC): null check in preShutdown
This can happen when there is a crash leading to shutdown before everything is set up.
2021-04-10 09:00:46 -07:00
Kevin Turner b787951e99 build: add google repo to terasology-repositories build logic
Gestalt depends on some annotation library from Google.
2021-04-10 08:59:30 -07:00
Kevin Turner 2f9d4afce7 Merge remote-tracking branch 'origin/nui-gestalt-separation' into feature/migrate-gestalt-v7
engine/src/main/java/org/terasology/engine/config/flexible/ui/AutoConfigWidgetFactory.java
engine/src/main/java/org/terasology/engine/config/flexible/ui/SettingWidgetFactory.java
engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java
engine/src/main/java/org/terasology/engine/network/internal/ClientConnectionHandler.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterUsernamePopup.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectionScreen.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/PlayerSettingsScreen.java
2021-04-02 09:53:54 -07:00
Kevin Turner 0767fc44a6 Merge remote-tracking branch 'origin/develop' into nui-gestalt-separation 2021-04-02 09:15:45 -07:00
Nail Khanipov 1ef57ce5d5
feat(player-config): migrate PlayerConfig to AutoConfig (#4599) 2021-04-02 17:45:23 +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
Kevin Turner 91a2a90a3c Merge remote-tracking branch 'origin/develop' into chore/move-in-place
subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java
subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java
2021-03-06 21:43:00 -08:00
Kevin Turner 06504fda24
refactor: move DiscordRPC to org.terasology.subsystem (#4562)
to indicate it is not in engine itself

Co-authored-by: Michael Pollind <polli104@mail.chapman.edu>
2021-03-06 20:08:47 -08:00
Michael Pollind 00c80a3f4c Merge remote-tracking branch 'origin/develop' into feature/THL-generic-serializer 2021-03-06 13:02:28 -08:00
Tobias Nett 54784a089e
Merge branch 'develop' into discord-rpc/improvement 2021-03-05 22:42:32 +01: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
iHDeveloper dc1c1587ad
feat(discord): Implement party size
- fix: can't hide start timestamp
2021-02-18 19:10:21 +03:00
iHDeveloper 129e8993ea
feat(discord): Ability to change details of the game
Used to set the gameplay name (e.g. Josharias Survival, Metal Renegades, etc...)
It will show on discord in this format "Game: <name>"

- Improve the buffer change trigger and handler
- Ability to change details in the buffer
- Apply the new format for the rich presence
-- Details -> "Game: <name>"
-- Party State -> "Playing Solo" / "Playing Online" / "Hosting"

- Fix: Triggering `Thread#setEnabled` with keeping the connection alive
- Fix: No safe shutdown to the RPC thread
2021-02-18 19:10:21 +03:00
iHDeveloper 4dc6ec621b
feat(discord): rewrite + make it thread-safe
The rewrite was necessary to be able to achieve the system to be thread-safe.
It gave the opportunity to organise how the subsystem works.

This also ensures the subsystem is easy to:
- Implement new features!
- Fix bugs without breaking stuff

- Separated the thread into its own class
- Subsystem manages the communication with the thread
- Re-organized the system
- Fix: disable discord-ipc library logger
2021-02-18 19:10:21 +03:00
iHDeveloper f8077d800d
feat(discord): change main menu state
Change main menu state from "In Lobby" to "In Main Menu"
2021-02-18 19:10:21 +03: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