Renamed main MicrobeSpecies organelles to ModifiableOrganelles by PsykeDoesStuff · Pull Request #6623 · Revolutionary-Games/Thrive

PsykeDoesStuff · 2026-01-10T13:44:10Z

Preface
this is my first PR so apologies for any formatting errors!
ive gone through and double checked everywhere however so everything here should be fine.

Brief Description of What This PR Does

This PR renames the MicrobeSpecies Organelles to ModifiableOrganelles, MicrobeSpecies ModifiableOrganelles (the original) to ReadonlyOrganelles for clarity.
ive also gone through and changed some of the unnecessary usages of Organelles to the readonly varient as they dont modify any data, thus dont need to have setter rights.

Related Issues
Closes #6483

Progress Checklist

Note: before starting this checklist the PR should be marked as non-draft.

PR author has checked that this PR works as intended and doesn't
break existing features:
https://wiki.revolutionarygamesstudio.com/wiki/Testing_Checklist
(this is important as to not waste the time of Thrive team
members reviewing this PR)
Initial code review passed (this and further items should not be checked by the PR author)
Functionality is confirmed working by another person (see above checklist link)
Final code review is passed and code conforms to the
styleguide.

Before merging all CI jobs should finish on this PR without errors, if
there are automatically detected style issues they should be fixed by
the PR author. Merging must follow our
styleguide.

…erything

…replaced with ReadonlyOrganelles

PsykeDoesStuff · 2026-01-11T11:33:21Z

edit: quickly fixed the ThriveTest.sln and jetbrains DevCentre requirements, sorry for not noticing sooner!

hhyyrylainen · 2026-01-12T09:11:40Z

Does this fully change all? I ask because you haven't marked this as "closing" the issue, you just linked the issue. If you did fully solve the issue you should write closes #6483

hhyyrylainen · 2026-01-12T09:12:23Z

Also is this meant to be a draft because as far as I can tell the code cannot compile currently?

hhyyrylainen · 2026-01-12T09:12:57Z

Thrive.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Godot.NET.Sdk/4.5.0">
+<Project Sdk="Godot.NET.Sdk/4.5.1">


We cannot update to Godot 4.5.1 as it has a critical bug that will only be fixed in Godot 4.6

PsykeDoesStuff · 2026-01-12T10:15:03Z

Oh thats my mistake, but this does compile and works fine im not sure why its saying otherwise, and the godot versions my bad i didnt see it listed on the setup guide, ill go through and recheck everything just to make sure

…bleorganelles

hhyyrylainen · 2026-01-12T10:38:06Z

Oh, it does compile but with warnings:

Thrive net10.0 succeeded with 3 warning(s) (8,6s) → .godot/mono/temp/bin/Debug/Thrive.dll
    /home/hhyyrylainen/Projects/Thrive/src/microbe_stage/MicrobeSpecies.cs(147,9): warning CA1033: Make 'MicrobeSpecies' sealed (a breaking change if this class has previously shipped), implement the method non-explicitly, or implement a new method that exposes the functionality of 'IReadOnlyCellDefinition.get_Organelles' and is visible to derived classes (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1033)
    /home/hhyyrylainen/Projects/Thrive/src/microbe_stage/MicrobeSpecies.cs(147,9): warning CA1033: Make 'MicrobeSpecies' sealed (a breaking change if this class has previously shipped), implement the method non-explicitly, or implement a new method that exposes the functionality of 'IReadOnlyCellDefinition.get_Organelles' and is visible to derived classes (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1033)
    /home/hhyyrylainen/Projects/Thrive/src/microbe_stage/MicrobeSpecies.cs(70,5): warning SA1005: Single line comment should begin with a space (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1005.md)
  ThriveTest net10.0 succeeded (0,4s) → test/code_tests/bin/Debug/net10.0/ThriveTest.dll

We don't allow any compiler warnings in Thrive so those will have to be fixed as well. (the CI system treats them as build errors)

hhyyrylainen · 2026-01-12T11:35:02Z

I corrected the "closes" syntax as it still was not correct (it needs to be exact for Github to automatically detect it).

hhyyrylainen · 2026-01-12T11:36:46Z

The null propagation stuff is likely not your fault. .NET 10 offers a new feature related to that so all of our old code is triggering the issue. For some reason when I run the check it doesn't detect all of the problems at once which is why I've been fixing those piecemeal.

PsykeDoesStuff · 2026-01-12T12:00:27Z

The null propagation stuff is likely not your fault. .NET 10 offers a new feature related to that so all of our old code is triggering the issue. For some reason when I run the check it doesn't detect all of the problems at once which is why I've been fixing those piecemeal.

Oh i see, maybe its something to do with me compiling on linux? But im not too sure

hhyyrylainen · 2026-01-12T13:31:20Z

How could that be? It's some kind of caching issue where the warnings are not reported until someone tries to change a file that would have the error.

I did already do a new commit to master fixing up the files the CI check failed on your branch so if you update the branch then it should stop failing for them.

…rganelles-to-modifiableorganelles

PsykeDoesStuff · 2026-01-12T13:45:09Z

I did already do a new commit to master fixing up the files the CI check failed on your branch so if you update the branch then it should stop failing for them.

Alright thats grand thank you!

How could that be? It's some kind of caching issue where the warnings are not reported until someone tries to change a file that would have the error.

Im not sure, im so used to weird platform specific bugs because of my previous work being with c and c++ that i assumdd it wpuld be the same with c#, my bad!

Ive just synced so hopwfully everything compiles properly now

hhyyrylainen · 2026-01-12T14:27:11Z

Im not sure, im so used to weird platform specific bugs because of my previous work being with c and c++ that i assumdd it wpuld be the same with c#, my bad!

Oh yeah, C++ does do that. Luckily in my experience C# does not have that at all. It probably helps that we only use the dotnet compiler on each platform and not platform specific compilers.

And funnily enough the C++ native module for Thrive did have a mac specific system linker bug that hit us and caused quite many headaches. That's now worked around with some changed build systems, but yeah I do still recall all kinds of stuff that goes wrong in C++ between platforms. But luckily we've not had that at all in C#.

Ive just synced so hopwfully everything compiles properly now

Yep. It looks like the CI checsk now fail purely due to your changes on this branch (too long lines, some not cleaned up whitespace, and an unnecessary using). You probably also want to clean up all of the unrelated changes like Scripts/DehydratedInfo.cs and I think you also accidentally downgraded the RevolutionaryGamesCommon git submodule.

PsykeDoesStuff · 2026-01-12T14:28:45Z

Oh really? Thats odd, ill have a look and fix it when im back at my pc

…pefully this fixes everything

PsykeDoesStuff · 2026-01-13T11:48:31Z

might be a silly question, but is there a way to get rider to detect the formatting issues so i dont have to commit to check them? in other news this should be the final commit

hhyyrylainen · 2026-01-13T11:49:35Z

https://github.com/Revolutionary-Games/Thrive/blob/master/doc/setup_instructions.md#running-the-format-checks

PsykeDoesStuff · 2026-01-13T12:42:11Z

alright so i've run the checks, turns out the only issues now are null propagation related

hhyyrylainen · 2026-01-13T13:10:36Z

You mean locally or...? This latest commit here is failing due to a few missing blank lines: https://dev.revolutionarygamesstudio.com/ci/1/build/16369/jobs/2

PsykeDoesStuff · 2026-01-13T15:04:56Z

yeah i meant locally haha, finally got there, even if it took a while and some defiantly amateur level mistakes on my end

hhyyrylainen · 2026-01-14T11:40:19Z

RevolutionaryGamesCommon

This I think is still a revert, if you press the "updated 1 files" on github and it opens a page that says

there isn't anything to compare, then that means that the submodule is going backwards in versions.

thats really odd, ill run sync again, hopefully should clear that up

hhyyrylainen · 2026-01-14T11:40:40Z

Thrive.csproj

    <ProjectReference Include="RevolutionaryGamesCommon\SharedBase\SharedBase.csproj" />
-    <ProjectReference Include="third_party\Arch.Extended\Arch.System.SourceGenerator\Arch.System.SourceGenerator.csproj" 
-                      OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="third_party\Arch.Extended\Arch.System.SourceGenerator\Arch.System.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />


Is there a reason for this change?

no, i dont believe i touched i just compiled it

Okay, then you should revert this file as well.

hhyyrylainen · 2026-01-14T11:40:50Z

Thrive.csproj.old.1

Old project backup files shouldn't be committed.

hhyyrylainen · 2026-01-14T11:47:45Z

src/microbe_stage/MicrobeSpecies.cs

+    public OrganelleLayout<OrganelleTemplate> ModifiableOrganelles { get; private set; }

-    public OrganelleLayout<OrganelleTemplate> ModifiableOrganelles => Organelles;
+    public OrganelleLayout<OrganelleTemplate> ReadonlyOrganelles => ModifiableOrganelles;


This doesn't look right... because this returns instances that are modifiable. Thus this basically isn't a real readonly view of the data. See how I've done the MulticellularSpecies.GameplayCells which is a readonly adapter that only allows readonly instances to be read.

And I just realized an even bigger problem here: The return type here is OrganelleLayout meaning that there's nothing that prevents someone from calling ReadOnlyOrganelles.Add(...) and that's just wrong, because we wouldn't be getting any safety improvement which was my main point why opened #6483

So, sorry if things weren't clear upfront.

of course thats no worries! ill go through and correct it :)

PsykeDoesStuff added 2 commits January 10, 2026 13:15

renamed all instances, please rename when you've finished checking ev…

7952d38

…erything

renamed var, removed unesssercary usages of ModifiableOrganelles and …

5da17af

…replaced with ReadonlyOrganelles

github-project-automation bot added this to Thrive Planning Jan 10, 2026

github-project-automation bot moved this to In progress in Thrive Planning Jan 10, 2026

fixed ThriveTests sln since i overlooked it previously, sorry

126a1ad

hhyyrylainen reviewed Jan 12, 2026

View reviewed changes

Merge branch 'master' into renamed-main-microbe-organelles-to-modifia…

84d46ab

…bleorganelles

PsykeDoesStuff added 2 commits January 12, 2026 10:45

fixed dev centre warnings

4857d60

fixed devcentre warnings

2f8fb8e

Merge branch 'Revolutionary-Games:master' into renamed-main-microbe-o…

208ee75

…rganelles-to-modifiableorganelles

PsykeDoesStuff added 3 commits January 13, 2026 11:37

fixed the dydrationinfo.cs whitespace and using jetbrains warning, ho…

f2c995e

…pefully this fixes everything

fixed formatting

927f66c

i really need to get some sort of format checker working on here

17d61a6

fixed whitespace issue*

3e2d8a5

hhyyrylainen added this to the Release 1.0.1 milestone Jan 14, 2026

hhyyrylainen reviewed Jan 14, 2026

View reviewed changes

Thrive.csproj.old.1

Copy link

Member

hhyyrylainen Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old project backup files shouldn't be committed.

hhyyrylainen requested changes Jan 14, 2026

View reviewed changes

hhyyrylainen moved this from In progress to started but stuck (help wanted) in Thrive Planning Jan 26, 2026

hhyyrylainen removed this from the Release 1.0.1 milestone Jan 26, 2026

Uh oh!

Conversation

PsykeDoesStuff commented Jan 10, 2026 • edited by hhyyrylainen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PsykeDoesStuff commented Jan 11, 2026

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PsykeDoesStuff commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

PsykeDoesStuff commented Jan 12, 2026

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

PsykeDoesStuff commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hhyyrylainen commented Jan 12, 2026

Uh oh!

PsykeDoesStuff commented Jan 12, 2026

Uh oh!

PsykeDoesStuff commented Jan 13, 2026

Uh oh!

hhyyrylainen commented Jan 13, 2026

Uh oh!

PsykeDoesStuff commented Jan 13, 2026

Uh oh!

hhyyrylainen commented Jan 13, 2026

Uh oh!

PsykeDoesStuff commented Jan 13, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

PsykeDoesStuff commented Jan 10, 2026 •

edited by hhyyrylainen

Loading

PsykeDoesStuff commented Jan 12, 2026 •

edited

Loading

PsykeDoesStuff commented Jan 12, 2026 •

edited

Loading