Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ecs-gestalt): Migrate Components to gestalt's Components. #12

Merged
merged 4 commits into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Copyright 2020 The Terasology Foundation
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.characters.humanoid;

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;

/**
* Humanoid character properties
*/
@Replicate(FieldReplicateType.OWNER_TO_SERVER_TO_CLIENT)
public class CharacterAppearanceComponent implements Component{
public class CharacterAppearanceComponent implements Component<CharacterAppearanceComponent> {

@Replicate(FieldReplicateType.OWNER_TO_SERVER_TO_CLIENT)
public Color skinColor;
Expand All @@ -25,4 +25,14 @@ public class CharacterAppearanceComponent implements Component{
public Color pantColor;
@Replicate(FieldReplicateType.OWNER_TO_SERVER_TO_CLIENT)
public Color shoeColor;

@Override
public void copyFrom(CharacterAppearanceComponent other) {
skinColor = new Color(skinColor);
eyeColor = new Color(eyeColor);
hairColor = new Color(hairColor);
shirtColor = new Color(shirtColor);
pantColor = new Color(pantColor);
shoeColor = new Color(shoeColor);
}
}
Original file line number Diff line number Diff line change
@@ -1,27 +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.characters.humanoid;

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

/**
* When this component is attached to a character a appearance selection dialog will be shown when the player joins.
*/
@Replicate(FieldReplicateType.SERVER_TO_CLIENT)
public class ShowCharacterAppearanceDialogComponent implements Component {
public class ShowCharacterAppearanceDialogComponent extends EmptyComponent<ShowCharacterAppearanceDialogComponent> {
}