diff --git a/src/main/java/org/terasology/scenario/components/HubToolExpansionComponent.java b/src/main/java/org/terasology/scenario/components/HubToolExpansionComponent.java index 8ae3e9d..dd8cca2 100644 --- a/src/main/java/org/terasology/scenario/components/HubToolExpansionComponent.java +++ b/src/main/java/org/terasology/scenario/components/HubToolExpansionComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Sets; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import java.util.HashSet; import java.util.Set; @@ -26,7 +14,12 @@ /** * Component that gets attached to a scenario hub tool that contains the list of entities that are expanded in the treeview of the logic entities */ -public class HubToolExpansionComponent implements Component{ +public class HubToolExpansionComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public Set expandedList = new HashSet<>(); + + @Override + public void copyFrom(HubToolExpansionComponent other) { + this.expandedList = Sets.newHashSet(other.expandedList); + } } diff --git a/src/main/java/org/terasology/scenario/components/ScenarioArgumentContainerComponent.java b/src/main/java/org/terasology/scenario/components/ScenarioArgumentContainerComponent.java index 13d7500..2a93e1b 100644 --- a/src/main/java/org/terasology/scenario/components/ScenarioArgumentContainerComponent.java +++ b/src/main/java/org/terasology/scenario/components/ScenarioArgumentContainerComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Maps; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.NetworkComponent; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.information.IndentificationComponents.ScenarioTypeIntegerComponent; import org.terasology.scenario.components.information.ScenarioValueStringComponent; @@ -36,7 +24,12 @@ * Scenario logic entities are detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioArgumentContainerComponent implements Component { +public class ScenarioArgumentContainerComponent implements Component { @Replicate - public Map arguments; + public Map arguments = Maps.newHashMap(); + + @Override + public void copyFrom(ScenarioArgumentContainerComponent other) { + this.arguments = Maps.newHashMap(other.arguments); + } } diff --git a/src/main/java/org/terasology/scenario/components/ScenarioComponent.java b/src/main/java/org/terasology/scenario/components/ScenarioComponent.java index ba0dec3..a5eae4e 100644 --- a/src/main/java/org/terasology/scenario/components/ScenarioComponent.java +++ b/src/main/java/org/terasology/scenario/components/ScenarioComponent.java @@ -1,26 +1,14 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Lists; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.NetworkComponent; import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.BlockRegion; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.actions.ScenarioIndicatorActionComponent; import org.terasology.scenario.components.actions.ScenarioSecondaryGiveBlockComponent; import org.terasology.scenario.components.regions.RegionBeingCreatedComponent; @@ -64,10 +52,16 @@ * * indicates optional (RegionBeingCreated meaning it is currently being created, ProtectedRegion meaning the region * is being protected by the structureTemplates system and will prevent alterations being made to the land within the region */ -public class ScenarioComponent implements Component { +public class ScenarioComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public List triggerEntities = new ArrayList<>(); @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public List regionEntities = new ArrayList<>(); + + @Override + public void copyFrom(ScenarioComponent other) { + this.triggerEntities = Lists.newArrayList(other.triggerEntities); + this.regionEntities = Lists.newArrayList(other.regionEntities); + } } diff --git a/src/main/java/org/terasology/scenario/components/ScenarioHubToolUpdateComponent.java b/src/main/java/org/terasology/scenario/components/ScenarioHubToolUpdateComponent.java index 3abd776..0ae6a9b 100644 --- a/src/main/java/org/terasology/scenario/components/ScenarioHubToolUpdateComponent.java +++ b/src/main/java/org/terasology/scenario/components/ScenarioHubToolUpdateComponent.java @@ -1,33 +1,26 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.NoReplicate; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that lets the client know that the scenario entity was updated and therefore it should redraw on the next update */ -public class ScenarioHubToolUpdateComponent implements Component { +public class ScenarioHubToolUpdateComponent implements Component { @NoReplicate public String localScreenID; @Replicate(FieldReplicateType.SERVER_TO_OWNER) public EntityRef addedEntity; + + @Override + public void copyFrom(ScenarioHubToolUpdateComponent other) { + this.localScreenID = other.localScreenID; + this.addedEntity = other.addedEntity; + } } diff --git a/src/main/java/org/terasology/scenario/components/ScenarioLogicLabelComponent.java b/src/main/java/org/terasology/scenario/components/ScenarioLogicLabelComponent.java index bf2c1e9..706710f 100644 --- a/src/main/java/org/terasology/scenario/components/ScenarioLogicLabelComponent.java +++ b/src/main/java/org/terasology/scenario/components/ScenarioLogicLabelComponent.java @@ -1,30 +1,22 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; /** * Label component for a Scenario logic entity, includes the text displayed on a dropdown menu for selecting an entity prefab in the logic editor * * Scenario logic entities detailed in {@link ScenarioComponent} */ -public class ScenarioLogicLabelComponent implements Component { +public class ScenarioLogicLabelComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String name; + + @Override + public void copyFrom(ScenarioLogicLabelComponent other) { + this.name = other.name; + } } diff --git a/src/main/java/org/terasology/scenario/components/ScenarioLogicTextComponent.java b/src/main/java/org/terasology/scenario/components/ScenarioLogicTextComponent.java index b5e25f5..dac320b 100644 --- a/src/main/java/org/terasology/scenario/components/ScenarioLogicTextComponent.java +++ b/src/main/java/org/terasology/scenario/components/ScenarioLogicTextComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.internal.utilities.ArgumentParser; /** @@ -31,7 +18,12 @@ * * Scenario logic entities detailed in {@link ScenarioComponent} */ -public class ScenarioLogicTextComponent implements Component { +public class ScenarioLogicTextComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String text; + + @Override + public void copyFrom(ScenarioLogicTextComponent other) { + this.text = other.text; + } } diff --git a/src/main/java/org/terasology/scenario/components/ScenarioRegionVisibilityComponent.java b/src/main/java/org/terasology/scenario/components/ScenarioRegionVisibilityComponent.java index 74f9224..ced914d 100644 --- a/src/main/java/org/terasology/scenario/components/ScenarioRegionVisibilityComponent.java +++ b/src/main/java/org/terasology/scenario/components/ScenarioRegionVisibilityComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Sets; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import java.util.HashSet; import java.util.Set; @@ -28,7 +16,12 @@ * local player (visibility of the regions are ticked to true) */ @Replicate(FieldReplicateType.SERVER_TO_OWNER) -public class ScenarioRegionVisibilityComponent implements Component { +public class ScenarioRegionVisibilityComponent implements Component { @Replicate(FieldReplicateType.OWNER_TO_SERVER) public Set visibleList = new HashSet<>(); + + @Override + public void copyFrom(ScenarioRegionVisibilityComponent other) { + visibleList = Sets.newHashSet(other.visibleList); + } } diff --git a/src/main/java/org/terasology/scenario/components/TriggerActionListComponent.java b/src/main/java/org/terasology/scenario/components/TriggerActionListComponent.java index 42b8218..85c1f52 100644 --- a/src/main/java/org/terasology/scenario/components/TriggerActionListComponent.java +++ b/src/main/java/org/terasology/scenario/components/TriggerActionListComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Lists; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import java.util.ArrayList; import java.util.List; @@ -27,7 +15,12 @@ * * Scenario logic entities detailed in {@link ScenarioComponent} */ -public class TriggerActionListComponent implements Component { +public class TriggerActionListComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public List actions = new ArrayList<>(); + + @Override + public void copyFrom(TriggerActionListComponent other) { + this.actions = Lists.newArrayList(other.actions); + } } diff --git a/src/main/java/org/terasology/scenario/components/TriggerConditionListComponent.java b/src/main/java/org/terasology/scenario/components/TriggerConditionListComponent.java index 1b99100..8936b4b 100644 --- a/src/main/java/org/terasology/scenario/components/TriggerConditionListComponent.java +++ b/src/main/java/org/terasology/scenario/components/TriggerConditionListComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Lists; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import java.util.ArrayList; import java.util.List; @@ -28,7 +16,12 @@ * * Scenario logic entities detailed in {@link ScenarioComponent} */ -public class TriggerConditionListComponent implements Component { +public class TriggerConditionListComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public List conditions = new ArrayList<>(); + + @Override + public void copyFrom(TriggerConditionListComponent other) { + this.conditions = Lists.newArrayList(other.conditions); + } } diff --git a/src/main/java/org/terasology/scenario/components/TriggerEventListComponent.java b/src/main/java/org/terasology/scenario/components/TriggerEventListComponent.java index e673f33..3176dd6 100644 --- a/src/main/java/org/terasology/scenario/components/TriggerEventListComponent.java +++ b/src/main/java/org/terasology/scenario/components/TriggerEventListComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Lists; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import java.util.ArrayList; import java.util.List; @@ -28,7 +16,12 @@ * * Scenario logic entities detailed in {@link ScenarioComponent} */ -public class TriggerEventListComponent implements Component { +public class TriggerEventListComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public List events = new ArrayList<>(); + + @Override + public void copyFrom(TriggerEventListComponent other) { + this.events = Lists.newArrayList(other.events); + } } diff --git a/src/main/java/org/terasology/scenario/components/TriggerNameComponent.java b/src/main/java/org/terasology/scenario/components/TriggerNameComponent.java index 0683dbe..0320f4e 100644 --- a/src/main/java/org/terasology/scenario/components/TriggerNameComponent.java +++ b/src/main/java/org/terasology/scenario/components/TriggerNameComponent.java @@ -1,30 +1,17 @@ -/* - * Copyright 2017 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.scenario.components; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that includes the details about a trigger, currently it is a name and three empty entities that are * used for the entity expansion of a hub tool that represent the blank event/condition/action portions of the UI */ -public class TriggerNameComponent implements Component { +public class TriggerNameComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String name; @@ -36,4 +23,12 @@ public class TriggerNameComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public EntityRef entityForAction; + + @Override + public void copyFrom(TriggerNameComponent other) { + this.name = other.name; + this.entityForEvent = other.entityForEvent; + this.entityForCondition = other.entityForCondition; + this.entityForAction = other.entityForAction; + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioIndicatorActionComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioIndicatorActionComponent.java index 35b56e9..1503222 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioIndicatorActionComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioIndicatorActionComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioIndicatorActionComponent implements Component { +public class ScenarioIndicatorActionComponent implements Component { + @Override + public void copyFrom(ScenarioIndicatorActionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryDamageAmountComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryDamageAmountComponent.java index 7a882c0..5b81f83 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryDamageAmountComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryDamageAmountComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryDamageAmountComponent implements Component { +public class ScenarioSecondaryDamageAmountComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryDamageAmountComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveBlockComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveBlockComponent.java index bf4afcc..3c53a58 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveBlockComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveBlockComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryGiveBlockComponent implements Component { +public class ScenarioSecondaryGiveBlockComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryGiveBlockComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveItemComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveItemComponent.java index d6b1082..22d1035 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveItemComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryGiveItemComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryGiveItemComponent implements Component { +public class ScenarioSecondaryGiveItemComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryGiveItemComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryHealAmountComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryHealAmountComponent.java index 7bdad44..99b488b 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryHealAmountComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryHealAmountComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryHealAmountComponent implements Component { +public class ScenarioSecondaryHealAmountComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryHealAmountComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryLogInfoComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryLogInfoComponent.java index 2271330..611d0a8 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryLogInfoComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryLogInfoComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -26,5 +13,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryLogInfoComponent implements Component { +public class ScenarioSecondaryLogInfoComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryLogInfoComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondarySendChatComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondarySendChatComponent.java index 6c2859b..e0b5282 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondarySendChatComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondarySendChatComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondarySendChatComponent implements Component { +public class ScenarioSecondarySendChatComponent implements Component { + @Override + public void copyFrom(ScenarioSecondarySendChatComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeBlockComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeBlockComponent.java index 6fb59e9..83c3142 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeBlockComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeBlockComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryTakeBlockComponent implements Component { +public class ScenarioSecondaryTakeBlockComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryTakeBlockComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeItemComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeItemComponent.java index 49e9436..83aa769 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeItemComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTakeItemComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryTakeItemComponent implements Component { +public class ScenarioSecondaryTakeItemComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryTakeItemComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTeleportComponent.java b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTeleportComponent.java index c19f4ad..9de08ae 100644 --- a/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTeleportComponent.java +++ b/src/main/java/org/terasology/scenario/components/actions/ScenarioSecondaryTeleportComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.actions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryTeleportComponent implements Component { +public class ScenarioSecondaryTeleportComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryTeleportComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioIndicatorConditionalComponent.java b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioIndicatorConditionalComponent.java index ad3f27b..ade3683 100644 --- a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioIndicatorConditionalComponent.java +++ b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioIndicatorConditionalComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.conditionals; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioIndicatorConditionalComponent implements Component { +public class ScenarioIndicatorConditionalComponent implements Component { + @Override + public void copyFrom(ScenarioIndicatorConditionalComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryBlockCompareComponent.java b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryBlockCompareComponent.java index ce4ff59..639a124 100644 --- a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryBlockCompareComponent.java +++ b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryBlockCompareComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.conditionals; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryBlockCompareComponent implements Component { +public class ScenarioSecondaryBlockCompareComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryBlockCompareComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryIntCompareComponent.java b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryIntCompareComponent.java index f6425b9..a5ae52a 100644 --- a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryIntCompareComponent.java +++ b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryIntCompareComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.conditionals; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryIntCompareComponent implements Component { +public class ScenarioSecondaryIntCompareComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryIntCompareComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryPlayerRegionComponent.java b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryPlayerRegionComponent.java index 0a1a54a..339b425 100644 --- a/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryPlayerRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/conditionals/ScenarioSecondaryPlayerRegionComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.conditionals; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryPlayerRegionComponent implements Component { +public class ScenarioSecondaryPlayerRegionComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryPlayerRegionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/ScenarioIndicatorEventComponent.java b/src/main/java/org/terasology/scenario/components/events/ScenarioIndicatorEventComponent.java index 1a8e349..b8a7318 100644 --- a/src/main/java/org/terasology/scenario/components/events/ScenarioIndicatorEventComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/ScenarioIndicatorEventComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.events; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioIndicatorEventComponent implements Component { +public class ScenarioIndicatorEventComponent implements Component { + @Override + public void copyFrom(ScenarioIndicatorEventComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryBlockDestroyComponent.java b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryBlockDestroyComponent.java index ea673ca..1a614fd 100644 --- a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryBlockDestroyComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryBlockDestroyComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.events; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryBlockDestroyComponent implements Component { +public class ScenarioSecondaryBlockDestroyComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryBlockDestroyComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryEnterRegionComponent.java b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryEnterRegionComponent.java index 69965dc..f45f437 100644 --- a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryEnterRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryEnterRegionComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.events; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryEnterRegionComponent implements Component { +public class ScenarioSecondaryEnterRegionComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryEnterRegionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryLeaveRegionComponent.java b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryLeaveRegionComponent.java index 1dd90bd..57cf7b0 100644 --- a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryLeaveRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryLeaveRegionComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.events; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryLeaveRegionComponent implements Component { +public class ScenarioSecondaryLeaveRegionComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryLeaveRegionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryRespawnComponent.java b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryRespawnComponent.java index e4c55be..544c192 100644 --- a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryRespawnComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondaryRespawnComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.events; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondaryRespawnComponent implements Component { +public class ScenarioSecondaryRespawnComponent implements Component { + @Override + public void copyFrom(ScenarioSecondaryRespawnComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondarySpawnComponent.java b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondarySpawnComponent.java index 739ade5..127c5d8 100644 --- a/src/main/java/org/terasology/scenario/components/events/ScenarioSecondarySpawnComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/ScenarioSecondarySpawnComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.events; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -25,5 +12,9 @@ * Scenario logic entities detailed in {@link ScenarioComponent} */ @Replicate -public class ScenarioSecondarySpawnComponent implements Component { +public class ScenarioSecondarySpawnComponent implements Component { + @Override + public void copyFrom(ScenarioSecondarySpawnComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/DestroyedBlockComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/DestroyedBlockComponent.java index ed3a24c..9e7598c 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/DestroyedBlockComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/DestroyedBlockComponent.java @@ -1,28 +1,15 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.prefab.Prefab; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component for a block being destroyed and the information passed with it */ -public class DestroyedBlockComponent implements Component { +public class DestroyedBlockComponent implements Component { /** * entity of the block that was destroyed */ @@ -37,4 +24,11 @@ public class DestroyedBlockComponent implements Component { * prefab of the item used to destroy the block */ public Prefab damageType; + + @Override + public void copyFrom(DestroyedBlockComponent other) { + this.destroyedBlock = other.destroyedBlock; + this.directCause = other.directCause; + this.damageType = other.damageType; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoDestroyedBlockComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoDestroyedBlockComponent.java index 29f2c19..698f905 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoDestroyedBlockComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoDestroyedBlockComponent.java @@ -1,28 +1,15 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.prefab.Prefab; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that is attached to the data entity that is passed when an event in the Scenario logic occurs. */ -public class InfoDestroyedBlockComponent implements Component { +public class InfoDestroyedBlockComponent implements Component { /** * entity of the block that was destroyed */ @@ -37,4 +24,11 @@ public class InfoDestroyedBlockComponent implements Component { * prefab of the item used to destroy the block */ public Prefab damageType; + + @Override + public void copyFrom(InfoDestroyedBlockComponent other) { + this.destroyedBlock = other.destroyedBlock; + this.directCause = other.directCause; + this.damageType = other.damageType; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTargetedEntityComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTargetedEntityComponent.java index 2347379..70b8e27 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTargetedEntityComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTargetedEntityComponent.java @@ -1,29 +1,21 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that is attached to the data entity that is passed when an event in the Scenario logic occurs. */ -public class InfoTargetedEntityComponent implements Component { +public class InfoTargetedEntityComponent implements Component { /** * entity that was targeted */ public EntityRef entity; + + @Override + public void copyFrom(InfoTargetedEntityComponent other) { + this.entity = other.entity; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggerRegionComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggerRegionComponent.java index 5233029..ec959a4 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggerRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggerRegionComponent.java @@ -1,28 +1,20 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that is attached to the data entity that is passed when an event in the Scenario logic occurs. */ -public class InfoTriggerRegionComponent implements Component { +public class InfoTriggerRegionComponent implements Component { /** * The entity of the region that was triggered (example: the joined region or the region that was just exited) */ public EntityRef region; + + @Override + public void copyFrom(InfoTriggerRegionComponent other) { + this.region = other.region; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggeringEntityComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggeringEntityComponent.java index bebebd2..786ba7d 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggeringEntityComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/InfoTriggeringEntityComponent.java @@ -1,29 +1,21 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that is attached to the data entity that is passed when an event in the Scenario logic occurs. */ -public class InfoTriggeringEntityComponent implements Component { +public class InfoTriggeringEntityComponent implements Component { /** * The entity that triggered the event and cause it to occur (Will usually be a player character) */ public EntityRef entity; + + @Override + public void copyFrom(InfoTriggeringEntityComponent other) { + this.entity = other.entity; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/TargetedEntityComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/TargetedEntityComponent.java index 1884f59..0b3c488 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/TargetedEntityComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/TargetedEntityComponent.java @@ -1,29 +1,21 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that contains the targeted entity when a logic event is triggered */ -public class TargetedEntityComponent implements Component { +public class TargetedEntityComponent implements Component { /** * Entity targeted for a triggered logic event */ public EntityRef entity; + + @Override + public void copyFrom(TargetedEntityComponent other) { + this.entity = other.entity; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeredRegionComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeredRegionComponent.java index cfc8907..7fb1f4e 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeredRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeredRegionComponent.java @@ -1,28 +1,20 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that contains the triggered region for an event */ -public class TriggeredRegionComponent implements Component { +public class TriggeredRegionComponent implements Component { /** * Targeted region for a triggered logic event */ public EntityRef region; + + @Override + public void copyFrom(TriggeredRegionComponent other) { + this.region = other.region; + } } diff --git a/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeringEntityComponent.java b/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeringEntityComponent.java index 2464932..1a5e2b3 100644 --- a/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeringEntityComponent.java +++ b/src/main/java/org/terasology/scenario/components/events/triggerInformation/TriggeringEntityComponent.java @@ -1,29 +1,21 @@ -/* - * Copyright 2017 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.scenario.components.events.triggerInformation; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.gestalt.entitysystem.component.Component; /** * Component that contains the entity that triggers an event */ -public class TriggeringEntityComponent implements Component { +public class TriggeringEntityComponent implements Component { /** * Entity that triggers the event */ public EntityRef entity; + + @Override + public void copyFrom(TriggeringEntityComponent other) { + this.entity = other.entity; + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeBlockComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeBlockComponent.java index 2e554fe..dc17c27 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeBlockComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeBlockComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypeBlockComponent implements Component { +public class ScenarioTypeBlockComponent implements Component { + @Override + public void copyFrom(ScenarioTypeBlockComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeComparatorComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeComparatorComponent.java index 798e9af..4bb3806 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeComparatorComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeComparatorComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypeComparatorComponent implements Component { +public class ScenarioTypeComparatorComponent implements Component { + @Override + public void copyFrom(ScenarioTypeComparatorComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeIntegerComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeIntegerComponent.java index fece51e..8092706 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeIntegerComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeIntegerComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypeIntegerComponent implements Component { +public class ScenarioTypeIntegerComponent implements Component { + @Override + public void copyFrom(ScenarioTypeIntegerComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeItemComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeItemComponent.java index fbe1e10..648c567 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeItemComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeItemComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypeItemComponent implements Component { +public class ScenarioTypeItemComponent implements Component { + @Override + public void copyFrom(ScenarioTypeItemComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypePlayerComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypePlayerComponent.java index eb61fa2..9eb3047 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypePlayerComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypePlayerComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypePlayerComponent implements Component { +public class ScenarioTypePlayerComponent implements Component { + @Override + public void copyFrom(ScenarioTypePlayerComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeRegionComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeRegionComponent.java index 14872fd..694da70 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeRegionComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypeRegionComponent implements Component { +public class ScenarioTypeRegionComponent implements Component { + @Override + public void copyFrom(ScenarioTypeRegionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeStringComponent.java b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeStringComponent.java index fbe721e..6ae5543 100644 --- a/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeStringComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/IndentificationComponents/ScenarioTypeStringComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information.IndentificationComponents; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioTypeStringComponent implements Component { +public class ScenarioTypeStringComponent implements Component { + @Override + public void copyFrom(ScenarioTypeStringComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionBlockCountComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionBlockCountComponent.java index f5de05a..e158bd8 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionBlockCountComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionBlockCountComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioExpressionBlockCountComponent implements Component { +public class ScenarioExpressionBlockCountComponent implements Component { + @Override + public void copyFrom(ScenarioExpressionBlockCountComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionConcatStringComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionConcatStringComponent.java index f2c1d41..0505b43 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionConcatStringComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionConcatStringComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioExpressionConcatStringComponent implements Component { +public class ScenarioExpressionConcatStringComponent implements Component { + @Override + public void copyFrom(ScenarioExpressionConcatStringComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionItemCountComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionItemCountComponent.java index 4562b9e..7b31a5a 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionItemCountComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionItemCountComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioExpressionItemCountComponent implements Component { +public class ScenarioExpressionItemCountComponent implements Component { + @Override + public void copyFrom(ScenarioExpressionItemCountComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionPlayerNameComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionPlayerNameComponent.java index 1a209d0..e19d146 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionPlayerNameComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionPlayerNameComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioExpressionPlayerNameComponent implements Component { +public class ScenarioExpressionPlayerNameComponent implements Component { + @Override + public void copyFrom(ScenarioExpressionPlayerNameComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRandomIntComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRandomIntComponent.java index 328b536..9d475c4 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRandomIntComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRandomIntComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioExpressionRandomIntComponent implements Component { +public class ScenarioExpressionRandomIntComponent implements Component { + @Override + public void copyFrom(ScenarioExpressionRandomIntComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRegionNameComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRegionNameComponent.java index 020ce8a..8f8dc52 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRegionNameComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioExpressionRegionNameComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioExpressionRegionNameComponent implements Component { +public class ScenarioExpressionRegionNameComponent implements Component { + @Override + public void copyFrom(ScenarioExpressionRegionNameComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockFamilyComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockFamilyComponent.java index 4c7545f..c7666ee 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockFamilyComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockFamilyComponent.java @@ -1,24 +1,11 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.family.BlockFamily; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -26,7 +13,12 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueBlockFamilyComponent implements Component { +public class ScenarioValueBlockFamilyComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public BlockFamily value; + + @Override + public void copyFrom(ScenarioValueBlockFamilyComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockUriComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockUriComponent.java index ff19989..ccbda31 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockUriComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueBlockUriComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,7 +12,12 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueBlockUriComponent implements Component { +public class ScenarioValueBlockUriComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String block_uri; + + @Override + public void copyFrom(ScenarioValueBlockUriComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueComparatorComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueComparatorComponent.java index 791d011..362b3ce 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueComparatorComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueComparatorComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,8 +12,8 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioValueComparatorComponent implements Component { - public enum comparison { +public class ScenarioValueComparatorComponent implements Component { + public enum Comparison { GREATER_THAN(">") { public boolean evaluate(int x, int y) { return x > y; @@ -60,7 +47,7 @@ public boolean evaluate(int x, int y) { private String stringRepresentation; - comparison(String stringRepresentation) { + Comparison(String stringRepresentation) { this.stringRepresentation = stringRepresentation; } @@ -71,5 +58,10 @@ public String toString() { public abstract boolean evaluate(int x, int y); } - public comparison compare = comparison.EQUAL_TO; + public Comparison compare = Comparison.EQUAL_TO; + + @Override + public void copyFrom(ScenarioValueComparatorComponent other) { + this.compare = other.compare; + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueIntegerComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueIntegerComponent.java index 33ab5aa..fd7bc1b 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueIntegerComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueIntegerComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,7 +12,12 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueIntegerComponent implements Component { +public class ScenarioValueIntegerComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public int value; + + @Override + public void copyFrom(ScenarioValueIntegerComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueItemPrefabUriComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueItemPrefabUriComponent.java index 6f8f605..9730374 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueItemPrefabUriComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueItemPrefabUriComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,7 +12,12 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueItemPrefabUriComponent implements Component { +public class ScenarioValueItemPrefabUriComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String prefabURI; + + @Override + public void copyFrom(ScenarioValueItemPrefabUriComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValuePlayerComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValuePlayerComponent.java index 67bbd1a..cbcc296 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValuePlayerComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValuePlayerComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,10 +12,15 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValuePlayerComponent implements Component { +public class ScenarioValuePlayerComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public PlayerType type = PlayerType.TRIGGERING_PLAYER; + @Override + public void copyFrom(ScenarioValuePlayerComponent other) { + + } + public enum PlayerType { TRIGGERING_PLAYER, TARGETED_PLAYER, diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueRegionComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueRegionComponent.java index 180a898..2f7e834 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueRegionComponent.java @@ -1,24 +1,11 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -26,7 +13,12 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueRegionComponent implements Component { +public class ScenarioValueRegionComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public EntityRef regionEntity; + + @Override + public void copyFrom(ScenarioValueRegionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueStringComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueStringComponent.java index 5d40452..5157a44 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueStringComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueStringComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,7 +12,12 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueStringComponent implements Component { +public class ScenarioValueStringComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String string; + + @Override + public void copyFrom(ScenarioValueStringComponent other) { + this.string = other.string; + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringBlockComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringBlockComponent.java index 3469aa1..7e0c6df 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringBlockComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringBlockComponent.java @@ -1,22 +1,9 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -25,5 +12,9 @@ * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ @Replicate -public class ScenarioValueTriggeringBlockComponent implements Component { +public class ScenarioValueTriggeringBlockComponent implements Component { + @Override + public void copyFrom(ScenarioValueTriggeringBlockComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringRegionComponent.java b/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringRegionComponent.java index fa38c00..a453811 100644 --- a/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringRegionComponent.java +++ b/src/main/java/org/terasology/scenario/components/information/ScenarioValueTriggeringRegionComponent.java @@ -1,21 +1,8 @@ -/* - * Copyright 2017 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.scenario.components.information; -import org.terasology.engine.entitySystem.Component; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioArgumentContainerComponent; /** @@ -23,5 +10,9 @@ * * Argument Entities detailed in {@link ScenarioArgumentContainerComponent} */ -public class ScenarioValueTriggeringRegionComponent implements Component { +public class ScenarioValueTriggeringRegionComponent implements Component { + @Override + public void copyFrom(ScenarioValueTriggeringRegionComponent other) { + + } } diff --git a/src/main/java/org/terasology/scenario/components/regions/RegionBeingCreatedComponent.java b/src/main/java/org/terasology/scenario/components/regions/RegionBeingCreatedComponent.java index 58bf3c2..eb22c11 100644 --- a/src/main/java/org/terasology/scenario/components/regions/RegionBeingCreatedComponent.java +++ b/src/main/java/org/terasology/scenario/components/regions/RegionBeingCreatedComponent.java @@ -1,25 +1,12 @@ -/* - * Copyright 2017 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.scenario.components.regions; import org.joml.Vector3i; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -27,10 +14,16 @@ * * Scenario region entities are detailed in {@link ScenarioComponent} */ -public class RegionBeingCreatedComponent implements Component { +public class RegionBeingCreatedComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public Vector3i firstHit; @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public EntityRef creatingEntity; + + @Override + public void copyFrom(RegionBeingCreatedComponent other) { + this.firstHit = other.firstHit; + this.creatingEntity = other.creatingEntity; + } } diff --git a/src/main/java/org/terasology/scenario/components/regions/RegionColorComponent.java b/src/main/java/org/terasology/scenario/components/regions/RegionColorComponent.java index 020575c..820520b 100644 --- a/src/main/java/org/terasology/scenario/components/regions/RegionColorComponent.java +++ b/src/main/java/org/terasology/scenario/components/regions/RegionColorComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.regions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.nui.Color; import org.terasology.scenario.components.ScenarioComponent; @@ -26,7 +13,12 @@ * * Scenario region entities are detailed in {@link ScenarioComponent} */ -public class RegionColorComponent implements Component { +public class RegionColorComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) - public Color color = Color.WHITE; + public Color color = new Color(Color.white); + + @Override + public void copyFrom(RegionColorComponent other) { + this.color = new Color(other.color); + } } diff --git a/src/main/java/org/terasology/scenario/components/regions/RegionContainingEntitiesComponent.java b/src/main/java/org/terasology/scenario/components/regions/RegionContainingEntitiesComponent.java index bf84a78..53e04a5 100644 --- a/src/main/java/org/terasology/scenario/components/regions/RegionContainingEntitiesComponent.java +++ b/src/main/java/org/terasology/scenario/components/regions/RegionContainingEntitiesComponent.java @@ -1,24 +1,12 @@ -/* - * Copyright 2017 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.scenario.components.regions; -import org.terasology.engine.entitySystem.Component; +import com.google.common.collect.Lists; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; import java.util.ArrayList; @@ -29,7 +17,12 @@ * * Scenario region entities are detailed in {@link ScenarioComponent} */ -public class RegionContainingEntitiesComponent implements Component { +public class RegionContainingEntitiesComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public List entities = new ArrayList<>(); + + @Override + public void copyFrom(RegionContainingEntitiesComponent other) { + this.entities = Lists.newArrayList(other.entities); + } } diff --git a/src/main/java/org/terasology/scenario/components/regions/RegionLocationComponent.java b/src/main/java/org/terasology/scenario/components/regions/RegionLocationComponent.java index 6b54ccb..6cdc0f7 100644 --- a/src/main/java/org/terasology/scenario/components/regions/RegionLocationComponent.java +++ b/src/main/java/org/terasology/scenario/components/regions/RegionLocationComponent.java @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.scenario.components.regions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; import org.terasology.engine.world.block.BlockRegion; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -13,7 +13,12 @@ * * Scenario region entities are detailed in {@link ScenarioComponent} */ -public class RegionLocationComponent implements Component { +public class RegionLocationComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) - public BlockRegion region; + public BlockRegion region = new BlockRegion(BlockRegion.INVALID); + + @Override + public void copyFrom(RegionLocationComponent other) { + this.region.set(other.region); + } } diff --git a/src/main/java/org/terasology/scenario/components/regions/RegionNameComponent.java b/src/main/java/org/terasology/scenario/components/regions/RegionNameComponent.java index cf7e3b2..11e1cc3 100644 --- a/src/main/java/org/terasology/scenario/components/regions/RegionNameComponent.java +++ b/src/main/java/org/terasology/scenario/components/regions/RegionNameComponent.java @@ -1,23 +1,10 @@ -/* - * Copyright 2017 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.scenario.components.regions; -import org.terasology.engine.entitySystem.Component; import org.terasology.engine.network.FieldReplicateType; import org.terasology.engine.network.Replicate; +import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.scenario.components.ScenarioComponent; /** @@ -26,7 +13,12 @@ * Scenario region entities are detailed in {@link ScenarioComponent} */ @Replicate -public class RegionNameComponent implements Component { +public class RegionNameComponent implements Component { @Replicate(FieldReplicateType.SERVER_TO_CLIENT) public String regionName = "New Region"; + + @Override + public void copyFrom(RegionNameComponent other) { + this.regionName = other.regionName; + } } diff --git a/src/main/java/org/terasology/scenario/internal/events/evaluationEvents/EvaluateComparatorEvent.java b/src/main/java/org/terasology/scenario/internal/events/evaluationEvents/EvaluateComparatorEvent.java index 7d2b6ba..de3be2d 100644 --- a/src/main/java/org/terasology/scenario/internal/events/evaluationEvents/EvaluateComparatorEvent.java +++ b/src/main/java/org/terasology/scenario/internal/events/evaluationEvents/EvaluateComparatorEvent.java @@ -25,18 +25,18 @@ * a value or expression logic entity to be evaluated into a comparator comparison value */ public class EvaluateComparatorEvent implements Event { - private ScenarioValueComparatorComponent.comparison result; + private ScenarioValueComparatorComponent.Comparison result; private EntityRef passedEntity; public EvaluateComparatorEvent(EntityRef passed) { this.passedEntity = passed; } - public void setResult(ScenarioValueComparatorComponent.comparison result) { + public void setResult(ScenarioValueComparatorComponent.Comparison result) { this.result = result; } - public ScenarioValueComparatorComponent.comparison getResult() { + public ScenarioValueComparatorComponent.Comparison getResult() { return result; } diff --git a/src/main/java/org/terasology/scenario/internal/systems/ConvertIntoEntitySystem.java b/src/main/java/org/terasology/scenario/internal/systems/ConvertIntoEntitySystem.java index 69a80d3..209766f 100644 --- a/src/main/java/org/terasology/scenario/internal/systems/ConvertIntoEntitySystem.java +++ b/src/main/java/org/terasology/scenario/internal/systems/ConvertIntoEntitySystem.java @@ -160,7 +160,7 @@ public void onConvertIntoEntityConstantEvent(ConvertIntoEntityConstantEvent even @ReceiveEvent public void onConvertIntoEntityConstantEvent(ConvertIntoEntityConstantEvent event, EntityRef entity, ScenarioValueComparatorComponent component) { - component.compare = ScenarioValueComparatorComponent.comparison.valueOf(event.getValue()); + component.compare = ScenarioValueComparatorComponent.Comparison.valueOf(event.getValue()); entity.saveComponent(component); } diff --git a/src/main/java/org/terasology/scenario/internal/ui/EditParameterScreen.java b/src/main/java/org/terasology/scenario/internal/ui/EditParameterScreen.java index b7a1720..9c0fc19 100644 --- a/src/main/java/org/terasology/scenario/internal/ui/EditParameterScreen.java +++ b/src/main/java/org/terasology/scenario/internal/ui/EditParameterScreen.java @@ -109,7 +109,7 @@ public class EditParameterScreen extends CoreScreenLayer { private UIDropdownScrollable blockDropdown; private UIDropdownScrollable itemDropdown; private UIDropdownScrollable regionDropdown; - private UIDropdownScrollable comparisonDropdown; + private UIDropdownScrollable comparisonDropdown; private List oldWidgets; private List blocksURI; @@ -325,7 +325,7 @@ private void setupInteraction() { emptyVariables(); comparisonDropdown = new UIDropdownScrollable<>(); - comparisonDropdown.setOptions(Arrays.asList(ScenarioValueComparatorComponent.comparison.values())); + comparisonDropdown.setOptions(Arrays.asList(ScenarioValueComparatorComponent.Comparison.values())); comparisonDropdown.setSelection(tempEntity.getComponent(ScenarioValueComparatorComponent.class).compare); variables.addWidget(comparisonDropdown); diff --git a/tutorials/ActionTutorial.md b/tutorials/ActionTutorial.md index 7157aa8..386899c 100644 --- a/tutorials/ActionTutorial.md +++ b/tutorials/ActionTutorial.md @@ -10,11 +10,11 @@ To start off we need to create a new Component that will be used to identify the Now we need to write our component class, for an indicator we need to do two steps, first we need to annotate the class with a `@Replicate` annotation and have it implement the `Component` interface. This results in our class looking like this: ```java - import org.terasology.engine.entitySystem.Component; + import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.engine.network.Replicate; @Replicate -public class ScenarioSecondaryGiveItemComponent implements Component { +public class ScenarioSecondaryGiveItemComponent implements Component { } ``` diff --git a/tutorials/ConditionalTutorial.md b/tutorials/ConditionalTutorial.md index 6ddbdd9..20556c1 100644 --- a/tutorials/ConditionalTutorial.md +++ b/tutorials/ConditionalTutorial.md @@ -10,11 +10,11 @@ To start off we need to create a new Component that will be used to identify the Now we need to write our component class, for an indicator we need to do two steps, first we need to annotate the class with a `@Replicate` annotation and have it implement the `Component` interface. This results in our class looking like this: ```java - import org.terasology.engine.entitySystem.Component; + import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.engine.network.Replicate; @Replicate -public class ScenarioSecondaryBlockCompareComponent implements Component { +public class ScenarioSecondaryBlockCompareComponent implements Component { } ``` diff --git a/tutorials/EventTutorial.md b/tutorials/EventTutorial.md index acd8299..b795400 100644 --- a/tutorials/EventTutorial.md +++ b/tutorials/EventTutorial.md @@ -10,11 +10,11 @@ To start off we need to create a new Component that will be used to identify the Now we need to write our component class, for an indicator we need to do two steps, first we need to annotate the class with a `@Replicate` annotation and have it implement the `Component` interface. This results in our class looking like this: ```java - import org.terasology.engine.entitySystem.Component; + import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.engine.network.Replicate; @Replicate -public class ScenarioSecondarySpawnComponent implements Component { +public class ScenarioSecondarySpawnComponent implements Component { } ``` diff --git a/tutorials/ExpressionTutorial.md b/tutorials/ExpressionTutorial.md index 6d03b0e..8938a8c 100644 --- a/tutorials/ExpressionTutorial.md +++ b/tutorials/ExpressionTutorial.md @@ -11,11 +11,11 @@ To start off we need to create a new Component that will be used to identify the Now we need to write our component class, for an indicator we need to do two steps, first we need to annotate the class with a `@Replicate` annotation and have it implement the `Component` interface. This results in our class looking like this: ```java - import org.terasology.engine.entitySystem.Component; + import org.terasology.gestalt.entitysystem.component.Component; import org.terasology.engine.network.Replicate; @Replicate -public class ScenarioExpressionBlockCountComponent implements Component { +public class ScenarioExpressionBlockCountComponent implements Component { } ```