[Breaking all] Gestalt v7 re-integration.... by DarkWeird · Pull Request #4144 · MovingBlocks/Terasology

DarkWeird · 2020-09-07T13:43:49Z

Contains

Re-integration gestaltv7

Changing engine module to package module. ( classpath modules dropped)
engine moved in self package (org.terasology.engine now)
create syntetic package module for nui (easier then write all in whitelist)
Update gestalt to 7.0.5
Update gson to 2.8.5
Update TeraNui to 2.0.0
Update Guava to 29.0-jre
Update Reflections to org.terasology:reflections:0.9.12-MB (gestalt build it)
Reimplemented Module download (gestalt drop BaseModule class)
Restore Module loading on gestalt v7
Use AutoreloadingAssetManager (seems asset must reload easier now)
Replace condition Module#isSourceModule to checking Module's files source == DirectoryFileSource - must be equal ( affected WorldGeneratorManager)
add Gestalt's classes to whitelist
remove duplication classes from org.terasology.input(org.terasology.engine.input now). We have this classes in TeraNUI
move cacheReflections task on after classes task (partial resolve Substantial performance issues in latest JS, possibly spawning at 0,0,0 in multiplayer #4126 (comment)) (reflections gathering for running from sources now)
remove cleanReflections after jar task
renamed cacheReflections's artifact reflections.cache to manifest.json and serializer changed to Json for using gestaltv7's default values

Fixes #2445

Testing

Check annotation marked classes reloading (e.g. WorldGenerator)
1. Run game from idea.
2. create game, exit
3. create dummy world generator in active module
4. create game with advanced settings,
5. try found your new world generator
Check assets reloading
1. Run game from idea. (in debug mode)
2. create game
3. change any asset of active module
4. recompile classes
5. exit game and load game
6. asset must be edited in game.
Check module downloading
1. Run game
2. Press New game
3. Press Create game
4. Press Advanced game setup
5. try download any module.
Fast check for 70% sure that game works
1. run gradlew test
2. try found failed tests ;)
Check guava 29.0-jre :
1. Play with MasterOfOreon ( minions uses guava's changed Futures for pathfinding)
2. make them to use pathfinding

6.* Check what everything works fine:

Play with all modules
check all features
if you found bug, be sure that bug from this PR :)

- impossible

Outstanding before merging

Engine compiles and runs.
Reimplement in-game module downloading.
[?] Check and fix from server module downloading.
Check and fix Assets.
Check and fix module loading.
Check and fix whitelist.
Fix tests.
Update module space

Linked PRs

MovingBlocks/TeraNUI#27

… First fix - fix imports.

fix problems for engine module as package module

… FileSystem in TempFolder

…y.engine` - for better PackageModule handling

…e reflections for gestaltv7)

…kage.

…tch. add synthetic nui module. add gestalt's classes to Whitelist

…n *.ui files for nui module)

…d mistypo.

4Denthusiast · 2020-09-11T12:23:07Z

Why was moving things from org.terasology to org.terasology.engine necessary? It'll probably conflict with every other PR in a way that'll be awkward to fix, and the majority of module PRs too, and it makes it harder to find the actual changes in this PR to review it. Github isn't even able to detect the files a moved. Is there really no other way to do this?

4Denthusiast · 2020-09-11T12:26:31Z

-        return result;
-    }
-}
+///*


There must be a better way of dealing with this than commenting out the entire file. Isn't there some mechanism for ignoring tests?

There must be a better way of dealing with this than commenting out the entire file. Isn't there some mechanism for ignoring tests?

It is draft PR. :P

Compile time problems.

This test and ModuleListDownloader will be reimplemented for gestalt v7

DarkWeird · 2020-09-11T13:23:58Z

Why was moving things from org.terasology to org.terasology.engine necessary? It'll probably conflict with every other PR in a way that'll be awkward to fix, and the majority of module PRs too, and it makes it harder to find the actual changes in this PR to review it. Github isn't even able to detect the files a moved. Is there really no other way to do this?

Gestalt v7 haven't classpath modules now (which works via detects ProtectedDomain of module.txt file).
Gestalt v7 uses packageModule now. It is more clean solution, really.
If I move package module back - then all classes(module's too) will be owned by engine.

I will mark changes in PRs.
99% chages not harmles and not affect functionality.

# Conflicts: # engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java # engine/src/main/java/org/terasology/logic/location/LocationComponent.java # engine/src/main/java/org/terasology/math/Direction.java

keturn · 2020-09-24T23:34:51Z

oh geez, how am I going to review this. I'm guessing it'll be a matter of looking at some specific commits, instead of the whole batch, and/or doing a diff of some specific sub-packages?

suggestions of which packages to look at? Just as a wild guess based on what I think gestalt does: persistence, reflection, core.module? anything else?

DarkWeird · 2020-09-25T06:23:54Z

Commit still works :D
Functional changes:
https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-d068a678d72605ebbfab1729d1d8df29 - module

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-f79fded56bde13b73bbe93b818ff82f0R116-R145 - assets registering ( also several places with this chages )

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-873dc4d71db70d570c73ef0cb16a8731 - don't remove reflections after jar and reflections creates after classes ( modules)
https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-1d22d9382cea237552a9f1e8e4485485 - don't remove reflections after jar and reflections creates after classes ( engine)

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-67cbca108af193bf1168895cb5237cfb - reimplement ModuleListDownloader (gestalt removed BaseModule and change ModuleMetadataJsonAdapater)

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-3e66f8ef304d0b5861aa3140ee518680 - remove ShrinkWrapFileSystem (Gestalt works only with Files instead Paths now - android compabality) (P.S. assets registring too)

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-1a57b96a1b0e27812cb3ca32cd8c8415R161-R162 - autoReload assets on EnvironmentSwitch - assetManager AutoReloadableAssetManager.

3e3faaf - nui syntetic module
b95028b - fix nui in UI assets

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-4e37f88c0233a3735d64003821a290baR119 - Replace module.IsSourceModule to this. gestaltv7 haven't this property.

https://github.com/MovingBlocks/Terasology/pull/4144/files#diff-9a8352c29b8e1414f20de160f54c8795 - Unittest package module now.

DarkWeird added 5 commits September 7, 2020 10:19

feature(reintegrate-gestaltv7): bump up gestalt dependencies version.…

a945a02

… First fix - fix imports.

feature(reintegrate-gestaltv7): Fix all source code problems

d1cce0c

feature(reintegrate-gestaltv7): Update gson.

3e7612d

fix problems for engine module as package module

feature(reintegrate-gestaltv7): fix engine-tests

89ff068

feature(gestaltv7): Restore Colorc in CanvasRenderers

3ad747e

DarkWeird force-pushed the feature/gestalt-v7 branch from a98fe46 to eef934f Compare September 9, 2020 07:03

feature(reintegrate-gestaltv7): replace ShrinkWrapSystem with defalut…

eef934f

… FileSystem in TempFolder

DarkWeird changed the title ~~Gestalt v7 re-integration....~~ [Breaking all] Gestalt v7 re-integration.... Sep 9, 2020

DarkWeird added the Topic: Architecture Requests, Issues and Changes related to software architecture, programming patterns, etc. label Sep 9, 2020

DarkWeird added 9 commits September 9, 2020 17:15

feature(reintegrate-gestaltv7): move engine to package `org.terasolog…

0b0aaac

…y.engine` - for better PackageModule handling

feature(reintegrate-gestaltv7): fix packageNames for runConfigs. (mak…

3602e53

…e reflections for gestaltv7)

feature(reintegrate-gestaltv7): move reflection in engine package

9176592

feature(reintegrate-gestaltv7): move reflection package to engine pac…

45b643d

…kage.

feature(reintegrate-gestaltv7): add reload handling on EnvironmentSwi…

3e3faaf

…tch. add synthetic nui module. add gestalt's classes to Whitelist

feature(reintegrate-gestaltv7): migrate ui types from engine to nui(i…

b95028b

…n *.ui files for nui module)

feature(reintegrate-gestaltv7): update guava lib version

fec847a

feature(reintegrate-gestaltv7): add gestalt's classes to whitelist an…

5646321

…d mistypo.

feature(reintegrate-gestaltv7): Fix emptymodules on return to main menu

46b97c6

4Denthusiast reviewed Sep 11, 2020

View reviewed changes

DarkWeird added 5 commits September 11, 2020 18:07

feature(reintegrate-gestaltv7): Fix tests

15501d9

feature(reintegrate-gestaltv7): Fix MTE tests

938d29e

feature(reintegrate-gestaltv7): cleanup build.gradle

cc5236d

feature(reintegrate-gestaltv7): cleanup and check gestalt related TODOs

685c96c

feature(reintegrate-gestaltv7): fix module downloading.

66deb05

This was referenced Sep 16, 2020

gestalt v7 Terasology/WorldlyTooltipAPI#2

Closed

gestalt v7 Terasology/WorldlyTooltip#12

Closed

gestalt v7 Terasology/WorkstationInGameHelp#9

Closed

gestalt v7 Terasology/WorkstationCrafting#15

Closed

DarkWeird marked this pull request as ready for review September 16, 2020 14:10

keturn self-requested a review September 20, 2020 20:02

keturn mentioned this pull request Oct 8, 2020

Substantial delay in connecting a player to a multiplayer server running JoshariasSurvival #4154

Open

This was referenced Jan 2, 2021

Investigate and enhance in-game module downloader, keeping extra attention on jar files in the modules directory #4367

Open

Bugfix/remove classpath #4372

Closed

keturn mentioned this pull request Jan 10, 2021

world loading takes an extremely long time with high CPU when many source modules are present #4393

Open

pollend mentioned this pull request Feb 13, 2021

Gestalt V7 Migration #4509

Closed

pollend closed this Feb 13, 2021

keturn mentioned this pull request Feb 22, 2021

refactor(ModuleManager): replace interface with concrete class #4539

Merged

keturn mentioned this pull request Mar 5, 2021

refactor! move engine code in to org.terasology.engine package #4560

Merged

skaldarnar deleted the feature/gestalt-v7 branch June 5, 2021 22:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Breaking all] Gestalt v7 re-integration....#4144

[Breaking all] Gestalt v7 re-integration....#4144
DarkWeird wants to merge 21 commits into
developfrom
feature/gestalt-v7

DarkWeird commented Sep 7, 2020 •

edited

Loading

Uh oh!

4Denthusiast commented Sep 11, 2020 •

edited

Loading

Uh oh!

4Denthusiast Sep 11, 2020

Uh oh!

DarkWeird Sep 11, 2020

Uh oh!

DarkWeird commented Sep 11, 2020

Uh oh!

keturn commented Sep 24, 2020

Uh oh!

DarkWeird commented Sep 25, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

DarkWeird commented Sep 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contains

Testing

Outstanding before merging

Linked PRs

Uh oh!

4Denthusiast commented Sep 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

4Denthusiast Sep 11, 2020

Choose a reason for hiding this comment

Uh oh!

DarkWeird Sep 11, 2020

Choose a reason for hiding this comment

Uh oh!

DarkWeird commented Sep 11, 2020

Uh oh!

keturn commented Sep 24, 2020

Uh oh!

DarkWeird commented Sep 25, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DarkWeird commented Sep 7, 2020 •

edited

Loading

4Denthusiast commented Sep 11, 2020 •

edited

Loading