New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/filterable abstraction #3215

Merged
merged 6 commits into from Jan 2, 2019

Conversation

Projects
None yet
3 participants
@Raycoms
Copy link
Contributor

Raycoms commented Jan 2, 2019

Closes #3194

Changes proposed in this pull request:

  • Abstracts filterable list buildings, views and GUIs
  • Adapts composter GUI already
  • Fixes issue where requests would update too late.

Review please

Raycoms added some commits Jan 1, 2019

Raycoms added some commits Jan 2, 2019

@OrionDevelopment
Copy link
Contributor

OrionDevelopment left a comment

Why the changes to the handling of the RS?

@@ -642,6 +642,10 @@ private void cancel(@NotNull final Button button)
if (getOpenRequestTreeOfCitizen().size() > row && row >= 0)
{
@NotNull final IRequest<?> request = getOpenRequestTreeOfCitizen().get(row).getRequest();
if (citizen.getWorkBuilding() != null)
{
colony.getBuilding(citizen.getWorkBuilding()).onRequestCancelled(colony.getRequestManager(), request.getToken());

This comment was marked as resolved.

@OrionDevelopment

OrionDevelopment Jan 2, 2019

Contributor

NO this will not work. The server handles this interaction exclusively.


if (citizen.getWorkBuilding() != null)
{
colony.getBuilding(citizen.getWorkBuilding()).onRequestComplete(colony.getRequestManager(), tRequest.getToken());

This comment was marked as resolved.

@OrionDevelopment

OrionDevelopment Jan 2, 2019

Contributor

Again!.

@Raycoms Raycoms merged commit c03b25f into version/1.12 Jan 2, 2019

3 of 4 checks passed

code-review/pullapprove Rejected
Details
Build (Branches) TeamCity build finished
Details
Build and Test (Pull Requests) TeamCity build finished
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment