Skip to content

Commit

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

Co-authored-by: Michael Pollind <mpollind@gmail.com>
Co-authored-by: Tobias Nett <skaldarnar@googlemail.com>
  • Loading branch information
3 people committed Aug 25, 2021
1 parent e08e532 commit 66bd015
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 37 deletions.
29 changes: 7 additions & 22 deletions src/main/java/org/terasology/portals/PortalComponent.java
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
/*
* Copyright 2014 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.portals;

import org.terasology.engine.entitySystem.Component;
//import org.terasology.model.structures.BlockSelection;
import org.terasology.gestalt.entitysystem.component.Component;

/**
* Component for future portal stuff
*
* @author Rasmus 'Cervator' Praestholm <cervator@gmail.com>
*/
public class PortalComponent implements Component {
/** The block positions that make up the portal itself (where stuff would spawn / teleport) */
//private BlockSelection _portalBlocks;
public class PortalComponent implements Component<PortalComponent> {
@Override
public void copyFrom(PortalComponent other) {

/** The block positions making up the frame, damage to the frame could break the portal */
//private BlockSelection _frameBlocks;
}
}
17 changes: 2 additions & 15 deletions src/main/java/org/terasology/portals/PortalSystem.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
/*
* Copyright 2014 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.portals;

import org.slf4j.Logger;
Expand Down

0 comments on commit 66bd015

Please sign in to comment.