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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
Aug 25, 2021
Merged

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

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f95e0c8
fix(ecs-gestalt): Migrate Components to gestalt's Components.
DarkWeird Jul 9, 2021
77148ee
chore: update components
pollend Jul 12, 2021
675acf2
chore: rename copy >>> copyFrom (as per MovingBlocks/gestalt#123)
skaldarnar Aug 14, 2021
4c4b72a
Merge branch 'develop' into feature/migrate-ecs-to-gestalt
jdrueckert Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 8 additions & 17 deletions src/main/java/org/terasology/joshariasSurvival/world/ForagableFoodProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
/*
* Copyright 2015 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.joshariasSurvival.world;

import com.google.common.base.Predicate;
Expand All @@ -24,7 +11,6 @@
import org.terasology.core.world.generator.facetProviders.PositionFilters;
import org.terasology.core.world.generator.facetProviders.SurfaceObjectProvider;
import org.terasology.core.world.generator.facets.BiomeFacet;
import org.terasology.engine.entitySystem.Component;
import org.terasology.engine.utilities.procedural.Noise;
import org.terasology.engine.utilities.procedural.WhiteNoise;
import org.terasology.engine.world.generation.ConfigurableFacetProvider;
Expand All @@ -37,6 +23,7 @@
import org.terasology.engine.world.generation.facets.SeaLevelFacet;
import org.terasology.engine.world.generation.facets.SurfacesFacet;
import org.terasology.engine.world.generator.plugin.RegisterPlugin;
import org.terasology.gestalt.entitysystem.component.Component;
import org.terasology.nui.properties.Range;

import java.util.List;
Expand Down Expand Up @@ -121,10 +108,14 @@ public void setConfiguration(Component configuration) {
this.configuration = (ForagableFoodDensityConfiguration) configuration;
}

private static class ForagableFoodDensityConfiguration implements Component {
private static class ForagableFoodDensityConfiguration implements Component<ForagableFoodDensityConfiguration> {
@Range(min = 0, max = 1.0f, increment = 0.05f, precision = 2, description = "Define the overall amount of foragable food")
private float density = 0.4f;

@Override
public void copyFrom(ForagableFoodDensityConfiguration other) {
this.density = other.density;
}
}

}