feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to ges…

…talt's (#58) Co-authored-by: darkweird <[email protected]> Co-authored-by: Josephine Rueckert <[email protected]>
Terasology · Dec 7, 2021 · a7f0c60 · a7f0c60
1 parent f29f2be
commit a7f0c60
Show file tree

Hide file tree

Showing 29 changed files with 90 additions and 198 deletions.
diff --git a/src/main/java/org/terasology/climateConditions/AffectBodyTemperatureEvent.java b/src/main/java/org/terasology/climateConditions/AffectBodyTemperatureEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;

diff --git a/src/main/java/org/terasology/climateConditions/BodyTemperatureLevel.java b/src/main/java/org/terasology/climateConditions/BodyTemperatureLevel.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;

diff --git a/src/main/java/org/terasology/climateConditions/BodyTemperatureLevelChangedEvent.java b/src/main/java/org/terasology/climateConditions/BodyTemperatureLevelChangedEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;

diff --git a/src/main/java/org/terasology/climateConditions/BodyTemperatureSystem.java b/src/main/java/org/terasology/climateConditions/BodyTemperatureSystem.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;
@@ -7,7 +7,6 @@
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
@@ -19,21 +18,23 @@
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.WorldComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 @RegisterSystem(value = RegisterMode.AUTHORITY)
 public class BodyTemperatureSystem extends BaseComponentSystem {
     public static final String BODY_TEMPERATURE_UPDATE_ACTION_ID = "climateConditions:bodyTemperatureUpdate";
 
     private static final Logger logger = LoggerFactory.getLogger(BodyTemperatureSystem.class);
 
-    @In
-    private EntityManager entityManager;
+    private static final int CHECK_INTERVAL = 1000;
+
     @In
     ClimateConditionsSystem climateConditionsSystem;
     @In
     DelayManager delayManager;
+    @In
+    private EntityManager entityManager;
 
-    private static final int CHECK_INTERVAL = 1000;
     private float criticalLowBodyTemperatureThreshold = 0.17f;
     private float lowBodyTemperatureThreshold = 0.22f;
     private float reducedBodyTemperatureThreshold = 0.3f;

diff --git a/src/main/java/org/terasology/climateConditions/BodyTemperatureValueChangedEvent.java b/src/main/java/org/terasology/climateConditions/BodyTemperatureValueChangedEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;

diff --git a/src/main/java/org/terasology/climateConditions/ClimateConditionsSystem.java b/src/main/java/org/terasology/climateConditions/ClimateConditionsSystem.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.climateConditions;
 
 import com.google.common.base.Function;

diff --git a/src/main/java/org/terasology/climateConditions/ConditionModifier.java b/src/main/java/org/terasology/climateConditions/ConditionModifier.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.climateConditions;
 
 public interface ConditionModifier {

diff --git a/src/main/java/org/terasology/climateConditions/ConditionsBaseField.java b/src/main/java/org/terasology/climateConditions/ConditionsBaseField.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2014 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.climateConditions;
 
 import com.google.common.base.Function;

diff --git a/src/main/java/org/terasology/climateConditions/FrostbiteSystem.java b/src/main/java/org/terasology/climateConditions/FrostbiteSystem.java
@@ -1,26 +1,12 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.climateConditions;
 
 import org.terasology.alterationEffects.speed.StunAlterationEffect;
 import org.terasology.engine.audio.StaticSound;
 import org.terasology.engine.audio.events.PlaySoundEvent;
 import org.terasology.engine.context.Context;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.prefab.PrefabManager;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
@@ -29,10 +15,11 @@
 import org.terasology.engine.logic.characters.CharacterSoundComponent;
 import org.terasology.engine.logic.delay.DelayManager;
 import org.terasology.engine.logic.delay.PeriodicActionTriggeredEvent;
-import org.terasology.module.health.events.DoDamageEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.utilities.random.FastRandom;
 import org.terasology.engine.utilities.random.Random;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
+import org.terasology.module.health.events.DoDamageEvent;
 
 /**
  * Adds frostbite to the player.
@@ -43,16 +30,16 @@
 public class FrostbiteSystem extends BaseComponentSystem {
     public static final String FROSTBITE_DAMAGE_ACTION_ID = "Frostbite Damage";
 
+    private static final int HEALTH_DECREASE_INTERVAL = 20000;
+    private static final int INITIAL_DELAY = 5000;
+    private static final int HEALTH_DECREASE_AMOUNT = 15;
+
     @In
     private DelayManager delayManager;
     @In
     private PrefabManager prefabManager;
     @In
     private Context context;
-
-    private static final int healthDecreaseInterval = 20000;
-    private static final int initialDelay = 5000;
-    private static final int healthDecreaseAmount = 15;
     private Random random = new FastRandom();
 
     /**
@@ -71,7 +58,7 @@ public void hypothermiaLevelChanged(HypothermiaLevelChangedEvent event, EntityRe
     }
 
     private void applyFrostbite(EntityRef player) {
-        delayManager.addPeriodicAction(player, FROSTBITE_DAMAGE_ACTION_ID, initialDelay, healthDecreaseInterval);
+        delayManager.addPeriodicAction(player, FROSTBITE_DAMAGE_ACTION_ID, INITIAL_DELAY, HEALTH_DECREASE_INTERVAL);
     }
 
     private void removeFrostbite(EntityRef player) {
@@ -90,7 +77,7 @@ public void onPeriodicFrostbite(PeriodicActionTriggeredEvent event, EntityRef pl
 
     private void applyFrostbiteDamagePlayer(EntityRef player) {
         Prefab frostbiteDamagePrefab = prefabManager.getPrefab("ClimateConditions:FrostbiteDamage");
-        player.send(new DoDamageEvent(healthDecreaseAmount, frostbiteDamagePrefab));
+        player.send(new DoDamageEvent(HEALTH_DECREASE_AMOUNT, frostbiteDamagePrefab));
     }
 
     private void applyStunEffect(EntityRef player, int duration) {

diff --git a/src/main/java/org/terasology/climateConditions/HumidityGeneratorSystem.java b/src/main/java/org/terasology/climateConditions/HumidityGeneratorSystem.java
@@ -9,12 +9,12 @@
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.Map;
 

diff --git a/src/main/java/org/terasology/climateConditions/HyperthermiaLevelChangedEvent.java b/src/main/java/org/terasology/climateConditions/HyperthermiaLevelChangedEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;

diff --git a/src/main/java/org/terasology/climateConditions/HyperthermiaSystem.java b/src/main/java/org/terasology/climateConditions/HyperthermiaSystem.java
@@ -1,29 +1,16 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.climateConditions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.characters.AffectJumpForceEvent;
 import org.terasology.engine.logic.characters.GetMaxSpeedEvent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.module.health.components.HealthComponent;
 import org.terasology.module.health.events.BeforeRegenEvent;
 import org.terasology.module.health.events.ChangeMaxHealthEvent;

diff --git a/src/main/java/org/terasology/climateConditions/HypothermiaLevelChangedEvent.java b/src/main/java/org/terasology/climateConditions/HypothermiaLevelChangedEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;
@@ -17,6 +17,6 @@
  */
 public class HypothermiaLevelChangedEvent extends BeforeAfterEvent<Integer> {
     public HypothermiaLevelChangedEvent(int oldLevel, int newLevel) {
-        super(oldLevel,newLevel);
+        super(oldLevel, newLevel);
     }
 }
diff --git a/src/main/java/org/terasology/climateConditions/HypothermiaSystem.java b/src/main/java/org/terasology/climateConditions/HypothermiaSystem.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2020 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.climateConditions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.characters.AffectJumpForceEvent;
 import org.terasology.engine.logic.characters.GetMaxSpeedEvent;
 import org.terasology.engine.logic.characters.MovementMode;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  *  Handles effects related to Hypothermia.

diff --git a/src/main/java/org/terasology/climateConditions/TemperatureGeneratorSystem.java b/src/main/java/org/terasology/climateConditions/TemperatureGeneratorSystem.java
@@ -9,12 +9,12 @@
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.Map;
 

diff --git a/src/main/java/org/terasology/climateConditions/ThermiaClientSystem.java b/src/main/java/org/terasology/climateConditions/ThermiaClientSystem.java
@@ -1,17 +1,17 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.assets.texture.TextureRegion;
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.engine.utilities.Assets;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  * Manages the player's Thermia UI used to display the hypo/hyperthermia icons in case of extreme body temperatures.

diff --git a/src/main/java/org/terasology/climateConditions/ThermiaHud.java b/src/main/java/org/terasology/climateConditions/ThermiaHud.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.climateConditions;