Skip to content

Commit

Permalink
fix(ecs-gestalt): Migrate Components to gestalt's Components. (#39)
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 authored Aug 25, 2021
1 parent 7192208 commit 6754388
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
12 changes: 10 additions & 2 deletions src/main/java/org/terasology/lost/ProgressTrackingComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@

package org.terasology.lost;

import com.google.common.collect.Maps;
import org.joml.Vector3i;
import org.terasology.engine.entitySystem.Component;
import org.terasology.gestalt.entitysystem.component.Component;

import java.util.HashMap;

/**
* Component to track a players progress during Lost
*/
public class ProgressTrackingComponent implements Component {
public class ProgressTrackingComponent implements Component<ProgressTrackingComponent> {
// Biomes mapped to the corresponding level URIs
HashMap<String, String> biomeToPrefab = new HashMap<String, String>();
// To track whether the well has been discovered
Expand All @@ -32,4 +33,11 @@ public void addLevel(String prefabName, String... biomes) {
biomeToPrefab.put(biome, prefabName);
}
}

@Override
public void copyFrom(ProgressTrackingComponent other) {
this.biomeToPrefab = Maps.newHashMap(other.biomeToPrefab);
this.foundWell = other.foundWell;
this.hutPosition.set(other.hutPosition);
}
}
26 changes: 9 additions & 17 deletions src/main/java/org/terasology/lost/portal/ArkenstoneComponent.java
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
/*
* 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.lost.portal;

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

@Replicate
public class ArkenstoneComponent implements Component {
public class ArkenstoneComponent implements Component<ArkenstoneComponent> {

// Stores whether block is activated
public boolean activated = false;

@Override
public void copyFrom(ArkenstoneComponent other) {
this.activated = other.activated;
}
}

0 comments on commit 6754388

Please sign in to comment.