Skip to content

Commit

Permalink
fix(ecs-gestalt): Migrate Components to gestalt's Components. (#127)
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 2af6639 commit d1e4e8d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 51 deletions.
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
/*
* Copyright 2018 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.sample.blocks;

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

public class ConnectsToDrawerComponent implements Component {
public class ConnectsToDrawerComponent implements Component<ConnectsToDrawerComponent> {
@Override
public void copyFrom(ConnectsToDrawerComponent other) {

}
}
Original file line number Diff line number Diff line change
@@ -1,25 +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.sample.crash;

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

/**
* Used by a block meant to crash the game, yay!
*/
public class CrashGameBlockComponent implements Component {
public class CrashGameBlockComponent implements Component<CrashGameBlockComponent> {
boolean reallyCrashy;

@Override
public void copyFrom(CrashGameBlockComponent other) {
this.reallyCrashy = other.reallyCrashy;
}
}
26 changes: 9 additions & 17 deletions src/main/java/org/terasology/sample/test/PrivateComponent.java
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
/*
* Copyright 2016 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.sample.test;

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

public final class PrivateComponent implements Component {
public final class PrivateComponent implements Component<PrivateComponent> {
private PrivateComponent() {

}

@Override
public void copyFrom(PrivateComponent other) {

}
}

0 comments on commit d1e4e8d

Please sign in to comment.