Skip to content
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

refactor!: overhaul package structure #78

Merged
merged 2 commits into from
Apr 18, 2021
Merged

Conversation

skaldarnar
Copy link
Contributor

@skaldarnar skaldarnar commented Apr 17, 2021

Organizes everything in this module under the namespace org.terasology.module.health. Sub-packages are used to organize the elements of the ECS, namely:

src/main/java/
└── org
    └── terasology
        └── module
            └── health
                ├── components
                │   ├── BlockDamagedComponent.java
                │   ├── DamageResistComponent.java
                │   ├── DamageSoundComponent.java
                │   ├── HealthComponent.java
                │   └── RegenComponent.java
                ├── events
                │   ├── ActivateRegenEvent.java
                │   ├── BeforeDamagedEvent.java
                │   ├── BeforeRestoreEvent.java
                │   ├── ChangeMaxHealthEvent.java
                │   ├── DeactivateRegenEvent.java
                │   ├── DoDamageEvent.java
                │   ├── DoRestoreEvent.java
                │   ├── HealthChangedEvent.java
                │   ├── MaxHealthChangedEvent.java
                │   ├── OnDamagedEvent.java
                │   ├── OnFullyHealedEvent.java
                │   ├── OnRestoredEvent.java
                │   └── RestoreFullHealthEvent.java
                ├── systems
                │   ├── BlockDamageAuthoritySystem.java
                │   ├── BlockDamageRenderer.java
                │   ├── DamageAuthoritySystem.java
                │   ├── HealthAuthoritySystem.java
                │   ├── HealthClientSystem.java
                │   ├── HealthCommands.java
                │   ├── RegenAuthoritySystem.java
                │   └── RestorationAuthoritySystem.java
                └── ui
                    ├── DirectionalDamageOverlay.java
                    ├── HealthHud.java
                    └── TimingInformation.java

This little script should help you get all the branches checked out locally:

git -C modules/Health fetch
git -C modules/Health checkout refactor/pkg-structure
for m in AdditionalRails AdventureAssets AlterationEffects Anatomy Behaviors Breathing ClimateConditions CombatSystem CoreSampleGameplay DamagingBlocks Equipment Explosives FallingBlocks FunnyBlocks GooeyDefence GooeysQuests GooKeeper Hunger Inferno IRLCorp ItemPipes LightAndShadow Lost ManualLabor MasterOfOreon MetalRenegades MobileBlocks MultiBlock PhysicalStats Potions Projectile Rails Sample Scenario Thirst WoodAndStone WorldlyTooltip; do
    git -C modules/$m fetch
    git -C modules/$m checkout refactor/adjust-for-health
done 

BREAKING CHANGE: moving and renaming packages is incompatible for all modules depending on Health. Therefore, bumping version to 2.0.0-SNAPSHOT

Resolves #71

@skaldarnar skaldarnar requested review from keturn and jdrueckert April 17, 2021 16:27
Organizes everything in this module under the namespace `org.terasology.module.health`. Sub-packages are used to organize the elements of the ECS, namely:

- components
- systems
- events
- ui

BREAKING CHANGE: moving and renaming packages is incompatible for all modules depending on Health.
Resolves #71
@skaldarnar skaldarnar force-pushed the refactor/pkg-structure branch from a4d9b96 to 4bc0037 Compare April 17, 2021 17:49
skaldarnar added a commit to Terasology/AdditionalRails that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/AdventureAssets that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/AlterationEffects that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Anatomy that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Behaviors that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Breathing that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/ClimateConditions that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/CombatSystem that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/CoreSampleGameplay that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/DamagingBlocks that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Equipment that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Explosives that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/FallingBlocks that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/MobileBlocks that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/MultiBlock that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/PhysicalStats that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Potions that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Projectile that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Rails that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Sample that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Scenario that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/Thirst that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology-Archived/WoodAndStone that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/WorldlyTooltip that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
skaldarnar added a commit to Terasology/GooeysQuests that referenced this pull request Apr 17, 2021
- bump version for Health to 2.0.0-SNAPSHOT
- adjust imports (auto-refactoring done by IntelliJ)

Depends on Terasology/Health#78
@skaldarnar
Copy link
Contributor Author

Module Overhaul - Health

@jdrueckert jdrueckert merged commit 8b326b9 into develop Apr 18, 2021
@jdrueckert jdrueckert deleted the refactor/pkg-structure branch April 18, 2021 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

organize under single health package
2 participants