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

…talt's (#30) Co-authored-by: Tobias Nett <skaldarnar@googlemail.com>
Terasology · Dec 8, 2021 · d510447 · d510447
1 parent 8f708f0
commit d510447
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 258 deletions.
diff --git a/src/main/java/org/terasology/dialogs/ChangeDialogEvent.java b/src/main/java/org/terasology/dialogs/ChangeDialogEvent.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2015 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.dialogs;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * Fired when the dialog component of an entity should change.

diff --git a/src/main/java/org/terasology/dialogs/CloseDialogEvent.java b/src/main/java/org/terasology/dialogs/CloseDialogEvent.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2015 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.dialogs;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * Fired when the dialog window should close.

diff --git a/src/main/java/org/terasology/dialogs/DefaultTitleParagraphStyle.java b/src/main/java/org/terasology/dialogs/DefaultTitleParagraphStyle.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2015 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.dialogs;
 
 import org.terasology.engine.rendering.assets.font.Font;

diff --git a/src/main/java/org/terasology/dialogs/DialogScreen.java b/src/main/java/org/terasology/dialogs/DialogScreen.java
@@ -1,15 +1,15 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.dialogs;
 
 import com.google.common.collect.Lists;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.dialogs.action.PlayerAction;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.rendering.assets.texture.TextureRegion;
 import org.terasology.engine.rendering.nui.CoreScreenLayer;
 import org.terasology.engine.rendering.nui.widgets.browser.data.html.HTMLDocument;
 import org.terasology.engine.rendering.nui.widgets.browser.ui.BrowserWidget;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.nui.UIWidget;
 import org.terasology.nui.databinding.ReadOnlyBinding;
 import org.terasology.nui.layouts.ColumnLayout;
@@ -40,10 +40,7 @@ public void initialise() {
     public boolean isModal() {
         return true;
     }
-
-    /**
-     * @param documentData
-     */
+
     public void setDocument(HTMLDocument documentData) {
         browser.navigateTo(documentData);
     }
@@ -72,7 +69,7 @@ public void addResponseOption(EntityRef charEnt, EntityRef talkTo, String text,
         newButton.setText(text);
         newImage.setImage(image);
         newImage.setFamily("imageColumn");
-        newImage.bindVisible(new ReadOnlyBinding<Boolean>() {
+        newImage.bindVisible(new ReadOnlyBinding<>() {
             @Override
             public Boolean get() {
                 return newButton.getMode().equals(UIButton.HOVER_MODE);

diff --git a/src/main/java/org/terasology/dialogs/DialogSystem.java b/src/main/java/org/terasology/dialogs/DialogSystem.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.dialogs;
@@ -8,7 +8,6 @@
 import org.terasology.dialogs.components.DialogResponse;
 import org.terasology.engine.core.SimpleUri;
 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.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
@@ -32,6 +31,7 @@
 import org.terasology.engine.unicode.EnclosedAlphanumerics;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.gestalt.assets.management.AssetManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.input.Input;
 import org.terasology.notify.ui.NotificationEvent;
 import org.terasology.notify.ui.RemoveNotificationEvent;
@@ -63,17 +63,11 @@ public class DialogSystem extends BaseComponentSystem {
 
     private String talkText;
 
-    private ParagraphRenderStyle titleStyle = new DefaultTitleParagraphStyle();
+    private final ParagraphRenderStyle titleStyle = new DefaultTitleParagraphStyle();
 
-    private Map<String, String> mappings = new HashMap<String, String>();
-    private TemplateEngine templateEngine = new TemplateEngineImpl(id -> {
-        String result = mappings.get(id);
-        if (result != null) {
-            return result;
-        } else {
-            return "?" + id + "?";
-        }
-    });
+    private final Map<String, String> mappings = new HashMap<>();
+
+    private final TemplateEngine templateEngine = new TemplateEngineImpl(id -> mappings.getOrDefault(id, "?" + id + "?"));
 
     @Override
     public void initialise() {

diff --git a/src/main/java/org/terasology/dialogs/ShowDialogEvent.java b/src/main/java/org/terasology/dialogs/ShowDialogEvent.java
@@ -1,35 +1,18 @@
-/*
- * Copyright 2015 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.dialogs;
 
 import org.terasology.dialogs.components.DialogComponent;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
-/**
- * TODO Type description
- */
 public class ShowDialogEvent implements Event {
 
     private final String page;
     private final EntityRef talkTo;
 
     /**
-     * @param dialogComponent
      * @param talkTo the other entity of the dialog
      * @param page
      */
@@ -38,9 +21,6 @@ public ShowDialogEvent(EntityRef talkTo, String page) {
         this.page = page;
     }
 
-    /**
-     * @return
-     */
     public DialogComponent getDialog() {
         return talkTo.getComponent(DialogComponent.class);
     }

diff --git a/src/main/java/org/terasology/dialogs/action/ChangeDialogAction.java b/src/main/java/org/terasology/dialogs/action/ChangeDialogAction.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2015 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.dialogs.action;
 
@@ -24,7 +11,7 @@
  */
 public class ChangeDialogAction implements PlayerAction {
 
-    private String prefab;
+    private final String prefab;
 
     public ChangeDialogAction(String prefab) {
         this.prefab = prefab;

diff --git a/src/main/java/org/terasology/dialogs/action/CloseDialogAction.java b/src/main/java/org/terasology/dialogs/action/CloseDialogAction.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2015 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.dialogs.action;
 

diff --git a/src/main/java/org/terasology/dialogs/action/NewDialogAction.java b/src/main/java/org/terasology/dialogs/action/NewDialogAction.java
@@ -1,34 +1,15 @@
-/*
- * Copyright 2015 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.dialogs.action;
 
 import org.terasology.dialogs.ShowDialogEvent;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 
-/**
- *
- */
 public class NewDialogAction implements PlayerAction {
 
-    private String target;
+    private final String target;
 
-    /**
-     * @param target
-     */
     public NewDialogAction(String target) {
         this.target = target;
     }
@@ -38,9 +19,6 @@ public void execute(EntityRef charEntity, EntityRef talkTo) {
         charEntity.send(new ShowDialogEvent(talkTo, target));
     }
 
-    /**
-     * @return
-     */
     public String getTarget() {
         return target;
     }

diff --git a/src/main/java/org/terasology/dialogs/action/PlayerAction.java b/src/main/java/org/terasology/dialogs/action/PlayerAction.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2015 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.dialogs.action;
 

diff --git a/src/main/java/org/terasology/dialogs/components/DialogResponse.java b/src/main/java/org/terasology/dialogs/components/DialogResponse.java
@@ -1,26 +1,13 @@
-/*
- * Copyright 2015 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.dialogs.components;
 
-import java.util.List;
-
 import org.terasology.dialogs.action.PlayerAction;
 import org.terasology.reflection.MappedContainer;
 
+import java.util.List;
+
 /**
  *
  */

diff --git a/src/main/java/org/terasology/notify/NotificationSystem.java b/src/main/java/org/terasology/notify/NotificationSystem.java
@@ -1,27 +1,14 @@
-/*
- * Copyright 2018 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.notify;
 
 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.nui.NUIManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.notify.ui.DialogNotificationOverlay;
 import org.terasology.notify.ui.NotificationEvent;
 import org.terasology.notify.ui.RemoveNotificationEvent;