Skip to content

Commit

Permalink
fix(ecs-gestalt): Migrate Components to gestalt's Components. (#12)
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 693a635 commit 258e48c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 20 deletions.
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> {
}

0 comments on commit 258e48c

Please sign in to comment.