feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to gestalt's

src/main/java/com/gempukku/lang/execution/FunctionCallExecution.java

@@ -85,9 +85,9 @@ public ExecutionProgress executeNextStatement(ExecutionContext executionContext,
             if (functionVar.getType() != Variable.Type.FUNCTION) {
                 throw new ExecutionException(line, "Expected function");
             }
-            FunctionExecutable function = (FunctionExecutable) functionVar.getValue();
-            final CallContext functionContextParent = function.getCallContext();
-            final Collection<String> parameterNames = function.getParameterNames();
+            FunctionExecutable func = (FunctionExecutable) functionVar.getValue();
+            final CallContext functionContextParent = func.getCallContext();
+            final Collection<String> parameterNames = func.getParameterNames();
             if (parameterValues.size() > parameterNames.size()) {
                 throw new ExecutionException(line, "Function does not accept as many parameters");
             }
@@ -101,7 +101,7 @@ public ExecutionProgress executeNextStatement(ExecutionContext executionContext,
                 }
                 i++;
             }
-            executionContext.stackExecutionGroup(functionContext, function.createExecution(line, executionContext, functionContext));
+            executionContext.stackExecutionGroup(functionContext, func.createExecution(line, executionContext, functionContext));
             functionCalled = true;
             return new ExecutionProgress(configuration.getStackGroupExecution() + configuration.getSetVariable() * parameterValues.size());
         }

src/main/java/com/gempukku/lang/parser/ScriptParser.java

@@ -281,8 +281,8 @@ private ExecutableStatement produceStatementFromGroupOrTerm(LastPeekingIterator<
         return statement;
     }
 
-    private ExecutableStatement produceConditionInBrackets(LastPeekingIterator<TermBlock> termIterator, DefinedVariables definedVariables
-            , ScriptParsingCallback scriptParsingCallback) throws IllegalSyntaxException {
+    private ExecutableStatement produceConditionInBrackets(LastPeekingIterator<TermBlock> termIterator, DefinedVariables definedVariables,
+                                                           ScriptParsingCallback scriptParsingCallback) throws IllegalSyntaxException {
         validateNextTermStartingWith(termIterator, "(");
         consumeCharactersFromTerm(termIterator, 1);
 
@@ -867,8 +867,8 @@ private ExecutableStatement produceMapDefinitionFromBlock(TermBlock termBlock, D
             validateNextTermStartingWith(iterator, ":");
             consumeCharactersFromTerm(iterator, 1);
 
-            mapStatement.addProperty(propertyLine, propertyColumn, propertyName, produceExpressionFromIterator(iterator, definedVariables
-                    , true, scriptParsingCallback));
+            mapStatement.addProperty(propertyLine, propertyColumn, propertyName, produceExpressionFromIterator(iterator, definedVariables,
+                    true, scriptParsingCallback));
 
             first = false;
         }
@@ -936,7 +936,9 @@ private TermBlock peekNextTermBlockSafely(LastPeekingIterator<TermBlock> termIte
     }
 
     private void validateNextTermStartingWith(LastPeekingIterator<TermBlock> termIterator, String text) throws IllegalSyntaxException {
-        if (!isNextTermStartingWith(termIterator, text)) throw new IllegalSyntaxException(termIterator, text + " expected");
+        if (!isNextTermStartingWith(termIterator, text)) {
+            throw new IllegalSyntaxException(termIterator, text + " expected");
+        }
     }
 
     private boolean isNextTermStartingWith(LastPeekingIterator<TermBlock> termIterator, String text) {

src/main/java/com/gempukku/lang/parser/Term.java

@@ -28,8 +28,8 @@ public String getValue() {
         return value;
     }
 
-    public void setValue(String value, int columnIncr) {
-        this.value = value;
+    public void setValue(String val, int columnIncr) {
+        this.value = val;
         column += columnIncr;
     }
 

src/main/java/com/gempukku/lang/parser/TermBlock.java

@@ -24,9 +24,9 @@ private TermBlock(Term term) {
         this.term = term;
     }
 
-    public void terminateTermBlock(int blockEndLine, int blockEndColumn) {
-        this.blockEndLine = blockEndLine;
-        this.blockEndColumn = blockEndColumn;
+    public void terminateTermBlock(int endLine, int endColumn) {
+        this.blockEndLine = endLine;
+        this.blockEndColumn = endColumn;
     }
 
     public int getBlockEndColumn() {
@@ -49,8 +49,8 @@ public void addTermBlock(TermBlock termBlock) {
         termBlocks.add(termBlock);
     }
 
-    public void addTermBlock(Term term) {
-        termBlocks.add(new TermBlock(term));
+    public void addTermBlock(Term termBlock) {
+        termBlocks.add(new TermBlock(termBlock));
     }
 
     public boolean isTerm() {

src/main/java/org/terasology/computer/event/client/ForceTerminalCloseEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class ForceTerminalCloseEvent implements Event {

src/main/java/org/terasology/computer/event/client/ProgramExecutionResultEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class ProgramExecutionResultEvent implements Event {

src/main/java/org/terasology/computer/event/client/ProgramListReceivedEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.Collection;
 

src/main/java/org/terasology/computer/event/client/ProgramTextReceivedEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class ProgramTextReceivedEvent implements Event {

src/main/java/org/terasology/computer/event/client/console/AppendConsoleLinesEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client.console;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class AppendConsoleLinesEvent implements Event {

src/main/java/org/terasology/computer/event/client/console/ClearConsoleScreenEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client.console;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class ClearConsoleScreenEvent implements Event {

src/main/java/org/terasology/computer/event/client/console/SetConsoleCharactersAtEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client.console;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class SetConsoleCharactersAtEvent implements Event {

src/main/java/org/terasology/computer/event/client/console/SetConsoleScreenEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.client.console;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class SetConsoleScreenEvent implements Event {

src/main/java/org/terasology/computer/event/server/ConsoleListeningRegistrationEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class ConsoleListeningRegistrationEvent implements Event {

src/main/java/org/terasology/computer/event/server/CopyProgramEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class CopyProgramEvent implements Event {

src/main/java/org/terasology/computer/event/server/DeleteProgramEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class DeleteProgramEvent implements Event {

src/main/java/org/terasology/computer/event/server/ExecuteProgramEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class ExecuteProgramEvent implements Event {

src/main/java/org/terasology/computer/event/server/GetProgramTextEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class GetProgramTextEvent implements Event {

src/main/java/org/terasology/computer/event/server/ListProgramsEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class ListProgramsEvent implements Event {

src/main/java/org/terasology/computer/event/server/RenameProgramEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class RenameProgramEvent implements Event {

src/main/java/org/terasology/computer/event/server/SaveProgramEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class SaveProgramEvent implements Event {

src/main/java/org/terasology/computer/event/server/StopProgramEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.computer.event.server;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @ServerEvent
 public class StopProgramEvent implements Event {

src/main/java/org/terasology/computer/module/inventory/InventoryModuleServerSystem.java

@@ -7,14 +7,14 @@
 import org.terasology.computer.system.server.lang.os.condition.InventoryCondition;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
-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.Share;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.module.inventory.events.InventorySlotChangedEvent;
 import org.terasology.module.inventory.events.InventorySlotStackSizeChangedEvent;
-import org.terasology.engine.registry.Share;
 
 import java.util.Iterator;
 

src/main/java/org/terasology/computer/system/client/ComputerClientSystem.java

@@ -16,14 +16,14 @@
 import org.terasology.computer.ui.ComputerTerminalWidget;
 import org.terasology.computer.ui.ComputerTerminalWindow;
 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.clipboard.ClipboardManager;
 import org.terasology.engine.logic.common.ActivateEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 @RegisterSystem(RegisterMode.CLIENT)
 public class ComputerClientSystem extends BaseComponentSystem {

src/main/java/org/terasology/computer/system/server/lang/TerasologyFunctionExecutable.java

@@ -67,7 +67,8 @@ public final Execution createExecution(final int line, ExecutionContext executio
         return new DelayedExecution(getDuration(), 0,
                 new SimpleExecution() {
                     @Override
-                    protected ExecutionProgress execute(ExecutionContext context, ExecutionCostConfiguration configuration) throws ExecutionException {
+                    protected ExecutionProgress execute(ExecutionContext context, ExecutionCostConfiguration configuration)
+                            throws ExecutionException {
                         final TerasologyComputerExecutionContext terasologyExecutionContext = (TerasologyComputerExecutionContext) context;
                         ComputerCallback computer = terasologyExecutionContext.getComputerCallback();
 

src/main/java/org/terasology/computer/ui/ComputerTerminalWidget.java

@@ -67,17 +67,17 @@ public class ComputerTerminalWidget extends CoreWidget {
     private ProgramEditingConsoleGui programEditingConsoleGui;
 
     public void setup(ComputerLanguageContextInitializer computerLanguageContextInitializer, ClipboardManager clipboardManager,
-                      Runnable closeRunnable, EntityRef clientEntity, int computerId) {
+                      Runnable runnable, EntityRef client, int id) {
         editingProgram = false;
         computerConsole = new ComputerConsole();
 
-        this.closeRunnable = closeRunnable;
-        this.clientEntity = clientEntity;
-        this.computerId = computerId;
+        this.closeRunnable = runnable;
+        this.clientEntity = client;
+        this.computerId = id;
 
         playerCommandConsoleGui = new PlayerCommandConsoleGui(this);
         playerCommandConsoleGui.appendToConsole("AutomationOS v. 0.0");
-        String userName = clientEntity.getComponent(CharacterComponent.class).controller.getComponent(ClientComponent.class)
+        String userName = client.getComponent(CharacterComponent.class).controller.getComponent(ClientComponent.class)
                 .clientInfo.getComponent(DisplayNameComponent.class).name;
         playerCommandConsoleGui.appendToConsole("You're logged in as " + userName +
                 ", use \"exit\" command to exit the console, use \"help\" to list commands.");