Merge pull request #4166 from pollend/feature/remove-action-event
feat: remove Has/Cancel/Add DelayedActionEventdevelop
commit
4365112dd4
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -260,20 +260,4 @@ public class DelayedActionSystem extends BaseComponentSystem implements UpdateSu
|
||||||
periodicEntity.saveComponent(periodicActionComponent);
|
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());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue