Skip to content

Commit

Permalink
fix(ecs-gestalt): Migrate Components to gestalt's Components. (#24)
Browse files Browse the repository at this point in the history
Ref: MovingBlocks/Terasology#4753

Co-authored-by: Tobias Nett <skaldarnar@googlemail.com>
  • Loading branch information
DarkWeird and skaldarnar committed Aug 25, 2021
1 parent 9f8fae1 commit 0f8ebe4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0

package org.terasology.additionalitempipes.components;

import org.terasology.engine.entitySystem.Component;
import com.google.common.collect.Lists;
import org.terasology.gestalt.entitysystem.component.Component;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

/**
* This Component differentiates the Sorter from other blocks. It contains the Sorter's filter and index od the side to which items not listed in the filter will be put.
*/
public class SorterComponent implements Component {
public class SorterComponent implements Component<SorterComponent> {
//A list of 6 lists (one per side) of strings (strings for filtering purposes based on the item's data)
public List<List<String>> filter = new LinkedList<List<String>>() {{
add(new ArrayList<>());
Expand All @@ -21,4 +26,12 @@ public class SorterComponent implements Component {
}};

public int defaultSideNum = 0;

@Override
public void copyFrom(SorterComponent other) {
this.filter = other.filter.stream()
.map(Lists::newArrayList)
.collect(Collectors.toList());
this.defaultSideNum = other.defaultSideNum;
}
}
Original file line number Diff line number Diff line change
@@ -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.additionalitempipes.components;

import org.terasology.engine.entitySystem.Component;
import org.terasology.gestalt.entitysystem.component.EmptyComponent;

public class UnificatorComponent implements Component {
public class UnificatorComponent extends EmptyComponent<UnificatorComponent> {
}

0 comments on commit 0f8ebe4

Please sign in to comment.