From 0808a38b016b1d6e51f0ff621c80101949017889 Mon Sep 17 00:00:00 2001
From: 4Denthusiast <25589515+4Denthusiast@users.noreply.github.com>
Date: Sat, 28 Nov 2020 16:13:28 +0000
Subject: [PATCH] Replace SurfaceHeightFacet with ElevationFacet

Because this world generator is so simple, it doesn't actually need
the SurfacesFacet at all.
---
 .../world/BuilderWorldRasterizer.java                  |  6 +++---
 .../minimalenginedemo/world/SurfaceProvider.java       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/terasology/tutorial/minimalenginedemo/world/BuilderWorldRasterizer.java b/src/main/java/org/terasology/tutorial/minimalenginedemo/world/BuilderWorldRasterizer.java
index 3343727..1a687f0 100644
--- a/src/main/java/org/terasology/tutorial/minimalenginedemo/world/BuilderWorldRasterizer.java
+++ b/src/main/java/org/terasology/tutorial/minimalenginedemo/world/BuilderWorldRasterizer.java
@@ -23,7 +23,7 @@
 import org.terasology.world.chunks.CoreChunk;
 import org.terasology.world.generation.Region;
 import org.terasology.world.generation.WorldRasterizer;
-import org.terasology.world.generation.facets.SurfaceHeightFacet;
+import org.terasology.world.generation.facets.ElevationFacet;
 
 public class BuilderWorldRasterizer implements WorldRasterizer {
 
@@ -38,9 +38,9 @@ public void initialize() {
 
     @Override
     public void generateChunk(CoreChunk chunk, Region chunkRegion) {
-        SurfaceHeightFacet surfaceHeightFacet = chunkRegion.getFacet(SurfaceHeightFacet.class);
+        ElevationFacet elevationFacet = chunkRegion.getFacet(ElevationFacet.class);
         for (Vector3i position : chunkRegion.getRegion()) {
-            float surfaceHeight = surfaceHeightFacet.getWorld(position.x, position.z);
+            float surfaceHeight = elevationFacet.getWorld(position.x, position.z);
             if (position.y < surfaceHeight - 1) {
                 chunk.setBlock(ChunkMath.calcRelativeBlockPos(position), dirt);
             } else if (position.y < surfaceHeight) {
diff --git a/src/main/java/org/terasology/tutorial/minimalenginedemo/world/SurfaceProvider.java b/src/main/java/org/terasology/tutorial/minimalenginedemo/world/SurfaceProvider.java
index a18a997..7657db6 100644
--- a/src/main/java/org/terasology/tutorial/minimalenginedemo/world/SurfaceProvider.java
+++ b/src/main/java/org/terasology/tutorial/minimalenginedemo/world/SurfaceProvider.java
@@ -25,9 +25,9 @@
 import org.terasology.world.generation.FacetProvider;
 import org.terasology.world.generation.GeneratingRegion;
 import org.terasology.world.generation.Produces;
-import org.terasology.world.generation.facets.SurfaceHeightFacet;
+import org.terasology.world.generation.facets.ElevationFacet;
 
-@Produces(SurfaceHeightFacet.class)
+@Produces(ElevationFacet.class)
 public class SurfaceProvider implements FacetProvider {
 
     private Noise surfaceNoise;
@@ -40,8 +40,8 @@ public void setSeed(long seed) {
     @Override
     public void process(GeneratingRegion region) {
         // Create our surface height facet (we will get into borders later)
-        Border3D border = region.getBorderForFacet(SurfaceHeightFacet.class);
-        SurfaceHeightFacet facet = new SurfaceHeightFacet(region.getRegion(), border);
+        Border3D border = region.getBorderForFacet(ElevationFacet.class);
+        ElevationFacet facet = new ElevationFacet(region.getRegion(), border);
 
         // loop through every position on our 2d array
         Rect2i processRegion = facet.getWorldRegion();
@@ -50,6 +50,6 @@ public void process(GeneratingRegion region) {
         }
 
         // give our newly created and populated facet to the region
-        region.setRegionFacet(SurfaceHeightFacet.class, facet);
+        region.setRegionFacet(ElevationFacet.class, facet);
     }
 }