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
142c44a255
test: provide a stub PathManager during tests ( #4648 )
2021-05-24 00:51:29 +02:00
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
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
e55b7f0fd7
feature: migrate to gestaltv7
2021-03-27 18:18:30 -07:00
36a8fb6747
Fixed compilation with NUI gestalt separation changes.
2021-03-20 22:03:29 +00:00
3ffe5fe794
Merge remote-tracking branch 'origin/develop' into chore/move-in-place
2021-03-07 13:09:14 -08:00
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
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
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
df19443394
Merge remote-tracking branch 'origin/develop' into chore/move-in-place
...
engine-tests/src/main/java/org/terasology/ModuleEnvironmentTest.java
engine-tests/src/main/java/org/terasology/TerasologyTestingEnvironment.java
engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigManagerTest.java
engine-tests/src/test/java/org/terasology/persistence/internal/StorageManagerTest.java
engine/src/main/java/org/terasology/entitySystem/event/internal/EventSystemImpl.java
engine/src/main/java/org/terasology/recording/EventSystemReplayImpl.java
2021-03-05 14:30:15 -08:00
7fd8605420
Merge branch 'develop' into discord-rpc/improvement
2021-03-05 23:23:44 +01:00
b63fa50631
chore: upgrade guava to 30.1 from 23.0 ( #4557 )
2021-03-05 14:21:06 -08:00
54784a089e
Merge branch 'develop' into discord-rpc/improvement
2021-03-05 22:42:32 +01:00
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
9a54577cfa
build: buildscript dependency on build-logic 2/2
...
buildSrc was a special thing from before gradle had composite builds.
build-logic is included like any other included build.
2021-03-01 14:32:19 -08:00
aa1678178d
build(PC): remove unused tasks for running headless server from source ( #4463 )
...
* build(PC): remove obsolete comment
* build(PC): remove unused tasks for generated server config
2021-02-21 20:17:32 +01:00
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
3e3854c36f
Merge remote-tracking branch 'origin/develop' into fix/sandboxed-module-path
2021-02-03 11:48:16 -08:00
6e51e06713
build(PC): GIT_BRANCH is no longer used for build information
2021-02-03 11:32:08 -08:00
a41bf76261
Merge branch 'chore/tidy-dist-tasks' into fix/sandboxed-module-path
2021-02-02 13:12:18 -08:00
512e8cfe20
build(PC): get access to kotlin.test as api dependency instead of explicit delegation
2021-02-02 13:09:10 -08:00
3254d522a3
build(PC): put dependency modules in moduleCache/
...
This is a good proof of concept for how to get Gradle to provide module dependencies, but IntelliJ might be blind to them.
2021-01-31 21:50:44 -08:00
8482b33975
build(PC): refactor "natives" dependency to facade plugin
2021-01-31 19:06:05 -08:00
ccaa920b6e
build(PC): refactor commonConfigure function to a RunTerasology task class
2021-01-31 18:58:18 -08:00
f9afdf6847
build(facade): refactor JavaExec.commonConfigure to buildSrc
...
It seems as if I want to import functions, they must in .kt and not .gradle.kts?
2021-01-31 17:47:06 -08:00
5616d32217
build(PC): rename `modules` config to `serverModules`
...
This is likely something to revisit but for now it helps me avoid accidentally messing with the server config.
2021-01-31 15:02:41 -08:00
1d9d8aacf5
fix(build): keep start scripts inside distZip's root directory
2021-01-29 20:39:45 -08:00
73888474d0
test(build): add testDistForLauncher and testDistZip
...
Some checks to make sure files end up where they are expected.
2021-01-29 20:27:02 -08:00
15a8c93b44
Merge remote-tracking branch 'origin/develop' into chore/tidy-dist-tasks
...
# Conflicts:
# engine/build.gradle
2021-01-29 13:51:49 -08:00
8aeca10df3
feat: Overhaul game version label content and trigger packaging of an Omega game zip in our new Jenkins ( #4409 )
2021-01-23 14:07:29 -06:00
1afeec9df3
chore (build): correct reference to upstream
2021-01-19 13:12:23 -08:00
5bb9dd4a2d
fix (build): use the jar-classpath start scripts
2021-01-19 12:57:02 -08:00
5248ea5a94
fix (build): don't set CLASSPATH in script, use the jar with the classpath in its manifest [Unix]
...
Unix shells have a longer line length limit than cmd.exe, but using the jar manifest will be more consistent with Windows and Launcher.
2021-01-19 12:49:42 -08:00
957cd1891f
fix (build): clean up after wayword auto-copyright-header-insertion
2021-01-19 12:46:46 -08:00
01ae5db1f2
fix (build): don't set CLASSPATH in script, use the jar with the classpath in its manifest [Windows]
...
otherwise cmd.exe fails with "the line is too long" errors.
https://github.com/gradle/gradle/issues/1989
2021-01-19 12:27:31 -08:00
78a4846b23
chore (build): rename scripts so the syntax highlighting is kinda right
...
Issue for proper support of this template format is https://youtrack.jetbrains.com/issue/IDEABKL-6135
2021-01-19 12:22:51 -08:00
3a678f8135
chore (build): initial import of start scripts as distributed by gradle
...
from https://github.com/gradle/gradle/tree/f38a522/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins
2021-01-19 12:19:09 -08:00
474a312704
chore (build): remove unused var
2021-01-17 15:06:07 -08:00
7189173ca1
chore (build): keep jars in "libs/" not "lib/" in distForLauncher
2021-01-17 14:37:57 -08:00
6f5af62a42
chore (build): remove old facade launch scripts
...
The exe versions were unmaintained and gradle provides startup scripts that are much better about compatibility than we were.
2021-01-17 11:19:05 -08:00
ffaacc735e
chore (build): replace dist tasks
...
Configure things so we can take advantage of more of gradle's defaults.
2021-01-17 11:15:29 -08:00
2b8a149cef
chore (build): include native libs in distribution
2021-01-17 11:12:17 -08:00
c4c866da27
refactor (build): move configurations to before dependencies where they're used
2021-01-17 10:46:43 -08:00
b8b058055a
chore (build): name facade's jar Terasology.jar
...
Launcher invokes it by naming this file, not by class lookup.
2021-01-16 21:25:01 -08:00
d4ed1827d9
chore(build): allow createVersionFile to run regardless of environment
2021-01-16 20:55:26 -08:00
a7e661ba21
refactor (build): move jar task to distribution-related section
2021-01-16 20:53:37 -08:00
61d35c9067
doc(build): createVersionTask
2021-01-16 20:52:21 -08:00
e4df5d904d
Merge remote-tracking branch 'origin/develop' into chore/tidy-dist-tasks
2021-01-16 20:39:26 -08:00
ae81241252
TeraEd: Run Terasology in Swing/AWT ( #4327 )
...
* TeraEd: Run Terasology in Swing/AWT
* TeraEd: Run Terasology in Swing/AWT - 2
* TeraEd: Run Terasology in Swing/AWT - 3
* TeraEd: Run Terasology in Swing/AWT - 4
* TeraEd: Run Terasology in Swing/AWT - 5
* TeraEd: Run Terasology in Swing/AWT - 6
* Merge branch 'develop' into develop-teraed
2021-01-06 19:58:03 +03:00
Tobias Nett
Kevin Turner
Michael Pollind
Benjamin Amos
iHDeveloper
Rasmus Praestholm
Miroslav Hajda