From c0c51df9d8ec9e69bd1a5a62472a9cf594707d04 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Wed, 30 Sep 2020 21:26:05 -0700 Subject: [PATCH] feat: remove Has/Cancel/Add DelayedActionEvent --- .../logic/delay/AddDelayedActionEvent.java | 40 ----------------- .../logic/delay/CancelDelayedActionEvent.java | 34 --------------- .../logic/delay/DelayedActionSystem.java | 16 ------- .../logic/delay/HasDelayedActionEvent.java | 43 ------------------- 4 files changed, 133 deletions(-) delete mode 100644 engine/src/main/java/org/terasology/logic/delay/AddDelayedActionEvent.java delete mode 100644 engine/src/main/java/org/terasology/logic/delay/CancelDelayedActionEvent.java delete mode 100644 engine/src/main/java/org/terasology/logic/delay/HasDelayedActionEvent.java diff --git a/engine/src/main/java/org/terasology/logic/delay/AddDelayedActionEvent.java b/engine/src/main/java/org/terasology/logic/delay/AddDelayedActionEvent.java deleted file mode 100644 index 73fb20942..000000000 --- a/engine/src/main/java/org/terasology/logic/delay/AddDelayedActionEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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. - */ -package org.terasology.logic.delay; - -import org.terasology.entitySystem.event.Event; - -/** - * @deprecated Use DelayManager::addDelayedAction instead. - */ -@Deprecated -public class AddDelayedActionEvent implements Event { - private String actionId; - private long delay; - - public AddDelayedActionEvent(String actionId, long delay) { - this.actionId = actionId; - this.delay = delay; - } - - public String getActionId() { - return actionId; - } - - public long getDelay() { - return delay; - } -} diff --git a/engine/src/main/java/org/terasology/logic/delay/CancelDelayedActionEvent.java b/engine/src/main/java/org/terasology/logic/delay/CancelDelayedActionEvent.java deleted file mode 100644 index f3a0a522e..000000000 --- a/engine/src/main/java/org/terasology/logic/delay/CancelDelayedActionEvent.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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. - */ -package org.terasology.logic.delay; - -import org.terasology.entitySystem.event.Event; - -/** - * @deprecated Use DelayManager::cancelDelayedAction instead. - */ -@Deprecated -public class CancelDelayedActionEvent implements Event { - private String actionId; - - public CancelDelayedActionEvent(String actionId) { - this.actionId = actionId; - } - - public String getActionId() { - return actionId; - } -} diff --git a/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java b/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java index 193e7a53e..7bca306df 100644 --- a/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java +++ b/engine/src/main/java/org/terasology/logic/delay/DelayedActionSystem.java @@ -260,20 +260,4 @@ public class DelayedActionSystem extends BaseComponentSystem implements UpdateSu periodicEntity.saveComponent(periodicActionComponent); } } - - // Deprecated methods - @ReceiveEvent(components = {DelayedActionComponent.class}) - public void getDelayedAction(HasDelayedActionEvent event, EntityRef entity) { - event.setResult(hasDelayedAction(entity, event.getActionId())); - } - - @ReceiveEvent(components = {DelayedActionComponent.class}) - public void cancelDelayedAction(CancelDelayedActionEvent event, EntityRef entity) { - cancelDelayedAction(entity, event.getActionId()); - } - - @ReceiveEvent - public void addDelayedAction(AddDelayedActionEvent event, EntityRef entity) { - addDelayedAction(entity, event.getActionId(), event.getDelay()); - } } diff --git a/engine/src/main/java/org/terasology/logic/delay/HasDelayedActionEvent.java b/engine/src/main/java/org/terasology/logic/delay/HasDelayedActionEvent.java deleted file mode 100644 index aba130284..000000000 --- a/engine/src/main/java/org/terasology/logic/delay/HasDelayedActionEvent.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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. - */ -package org.terasology.logic.delay; - -import org.terasology.entitySystem.event.Event; - -/** - * @deprecated Use DelayManager::hasDelayedAction instead. - */ -@Deprecated -public class HasDelayedActionEvent implements Event { - private String actionId; - private boolean result; - - public HasDelayedActionEvent(String actionId) { - this.actionId = actionId; - } - - public String getActionId() { - return actionId; - } - - public boolean hasAction() { - return result; - } - - public void setResult(boolean result) { - this.result = result; - } -}