Update networks/legacy_roads/house.py

.github/workflows/gdmc.yml

@@ -1,24 +0,0 @@
-name: Linux arm64
-run-name: Run genaration
-
-on: [push]
-
-jobs:
-  Build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-
-      - name: Pip
-        run: |
-          apt update
-          apt install python3-virtualenv libgl1-mesa-glx -y
-          virtualenv --python=python3 pythonenv
-          source pythonenv/bin/activate
-          pip install -r requirements.txt
-
-      - name: Run
-        run: |
-          source pythonenv/bin/activate
-          python3 main.py

House.py

@@ -2,7 +2,6 @@ from time import sleep
 from gdpc import Editor, Block, geometry
 import numpy as np
 import math
-import config
 import matplotlib.pyplot as plt
 
 
@@ -1251,7 +1250,7 @@ class House:
 
 
 if __name__ == "__main__":
-    editor = Editor(host=config.getHost(), buffering=True)
+    editor = Editor(buffering=True)
     buildArea = editor.getBuildArea()
     coordinates_min = [min(buildArea.begin[i], buildArea.last[i])
                        for i in range(3)]

config.py

@@ -1,2 +0,0 @@
-def getHost():
-	return "http://gdmc.ale-pri.com:9000"

main.py

@@ -15,8 +15,7 @@ from networks.geometry.Point3D import Point3D
 from networks.geometry.Point2D import Point2D
 from networks.geometry.Circle import Circle
 
-from PIL import Image as img
+from PIL import Image
-from PIL.Image import Image
 from utils.JsonReader import JsonReader
 from utils.YamlReader import YamlReader
 from buildings.Building import Building
@@ -24,7 +23,6 @@ from buildings.Building import Building
 from utils.functions import *
 from utils.Enums import DIRECTION
 import time
-import config
 
 
 def main():
@@ -33,7 +31,7 @@ def main():
     rectangle_house_mountain, rectangle_building, skeleton_highway, skeleton_mountain, road_grid = world_maker()
     time_world_maker = time.time() - start_time
     print(f"[TIME] World_maker {time_world_maker}")
-    editor = Editor(host=config.getHost(), buffering=True)
+    editor = Editor(buffering=True)
     buildArea = editor.getBuildArea()
     origin = ((buildArea.begin).x, (buildArea.begin).z)
     center = (abs(buildArea.begin.x - buildArea.end.x) / 2,
@@ -46,7 +44,6 @@ def main():
     time_remove_tree = time.time() - start_time
     print(f"[TIME] Remove tree {time_remove_tree}")
 
-    """
     start_time = time.time()
     smooth_terrain('./world_maker/data/heightmap.png',
                    './world_maker/data/heightmap_smooth.png', './world_maker/data/smooth_sobel_watermap.png')
@@ -120,17 +117,17 @@ def main():
                       entranceDirection[random.randint(0, 3)], blocks)
         house.build()
     time_houses = time.time() - start_time
-    print(f"[TIME] Houses {time_houses}") """
+    print(f"[TIME] Houses {time_houses}")
 
     print("[GDMC] Done!\n\n")
 
     print(f"[TIME] Total {time.time() - start_time_all}")
     print(f"[TIME] World_maker {time_world_maker}")
     print(f"[TIME] Remove tree {time_remove_tree}")
-    #print(f"[TIME] Smooth terrain {time_smooth_terrain}")
+    print(f"[TIME] Smooth terrain {time_smooth_terrain}")
-    #print(f"[TIME] Roads {time_roads}")
+    print(f"[TIME] Roads {time_roads}")
-    #print(f"[TIME] Buildings {time_buildings}")
+    print(f"[TIME] Buildings {time_buildings}")
-    #print(f"[TIME] Houses {time_houses}")
+    print(f"[TIME] Houses {time_houses}")
 
 
 def get_height_building_from_center(center, position, length_world):
@@ -165,7 +162,7 @@ def set_roads(skeleton: Skeleton, origin):
         for j in range(len(skeleton.lines[i])):
             xyz = transpose_form_heightmap('./world_maker/data/heightmap.png',
                                            skeleton.coordinates[skeleton.lines[i][j]], origin)
-            heightmap_smooth = img.open(
+            heightmap_smooth = Image.open(
                 './world_maker/data/road_heightmap.png')
             skeleton.lines[i][j] = [xyz[0], heightmap_smooth.getpixel(
                 (skeleton.coordinates[skeleton.lines[i][j]][0], skeleton.coordinates[skeleton.lines[i][j]][-1])), xyz[2]]

main69.py

@@ -1,12 +0,0 @@
-from gdpc import Editor, Block, geometry
-
-editor = Editor(host="http://gdmc.ale-pri.com:9000", buffering=True)
-
-# Get a block
-block = editor.getBlock((0,48,0))
-
-# Place a block
-editor.placeBlock((0,80,0), Block("stone"))
-
-# Build a cube
-geometry.placeCuboid(editor, (0,80,2), (2,82,4), Block("oak_planks"))

networks/legacy_roads/Skeleton.py

@@ -5,7 +5,6 @@ from skan.csr import skeleton_to_csgraph
 from collections import Counter
 from PIL import Image
 import random
-import config
 
 from gdpc import Editor
 
@@ -142,7 +141,7 @@ class Skeleton:
         Returns:
             image: 2D path of the skeleton on top of the heightmap.
         """
-        editor = Editor(host=config.getHost())
+        editor = Editor()
 
         buildArea = editor.getBuildArea()
         buildRect = buildArea.toRect()

networks/legacy_roads/roads.py

@@ -7,7 +7,6 @@ from gdpc import Block as place
 import numpy as np
 import networks.legacy_roads.maths as maths
 import math
-import config
 
 import networks.legacy_roads.tools as tools
 
@@ -507,7 +506,7 @@ def irlToMc(coordinates):
 
     heightmap = Image.open('./world_maker/data/heightmap.png')
 
-    editor = Editor(host=config.getHost())
+    editor = Editor()
     buildArea = editor.getBuildArea()
     xMin = (editor.getBuildArea().begin).x
     yMin = (editor.getBuildArea().begin).y
@@ -550,7 +549,7 @@ def setRoads(skeleton):
     for i in range(len(housesCoordinates)):
         pos = housesCoordinates[i]
         # print(pos, "pos0")
-        editor = Editor(host=config.getHost())
+        editor = Editor()
         xMin = (editor.getBuildArea().begin).x
         yMin = (editor.getBuildArea().begin).y
         zMin = (editor.getBuildArea().begin).z

networks/legacy_roads/tools.py

@@ -1,11 +1,10 @@
 from gdpc import Block as place
 from gdpc import Editor
-import config
 import networks.legacy_roads.maths as maths
 
 
 USE_BATCHING = True
-editor = Editor(host= config.getHost(), buffering=True, caching=True, multithreading=True)
+editor = Editor(buffering=True, caching=True, multithreading=True)
 
 
 def setBlock(block, xyz):

networks/roads/Road.py

@@ -4,7 +4,6 @@ import networks.roads.lanes.Lane as Lane
 import networks.roads.lines.Line as Line
 import json
 import random
-import config
 
 from gdpc import Editor, Block, geometry
 
@@ -16,7 +15,7 @@ class Road:
         self.width = 10  # TODO
 
     def place_roads(self):
-        editor = Editor(host=config.getHost(), buffering=True)
+        editor = Editor(buffering=True)
 
         self.resolution, self.distance = curve_tools.resolution_distance(
             self.coordinates, 12)

networks/roads_2/Road.py

@@ -12,7 +12,6 @@ from gdpc import Block, Editor, geometry
 from scipy.ndimage import gaussian_filter1d
 import numpy as np
 import random
-import config
 
 from PIL import Image
 
@@ -280,7 +279,7 @@ class Road:
                 self.segment_total_line_output[i].x, reference[self.segment_total_line_output[i].nearest(Point3D.to_2d(reference, 'y'), True)[0]].y, self.segment_total_line_output[i].y), Block("black_concrete")))
 
     def place(self):
-        editor = Editor(host=config.getHost(), buffering=True)
+        editor = Editor(buffering=True)
         for i in range(len(self.output_block)):
             editor.placeBlock(self.output_block[i][0],
                               self.output_block[i][1])

world_maker/Skeleton.py

@@ -4,8 +4,7 @@ from typing import List, Union
 
 import numpy as np
 from gdpc import Editor
-from PIL.Image import Image
+from PIL import Image, ImageDraw
-from PIL import Image as img, ImageDraw
 from skan.csr import skeleton_to_csgraph
 from skimage.morphology import skeletonize
 from networks.geometry.Point3D import Point3D
@@ -13,7 +12,7 @@ from networks.geometry.Point3D import Point3D
 
 def handle_import_image(image: Union[str, Image]) -> Image:
     if isinstance(image, str):
-        return img.open(image)
+        return Image.open(image)
     return image
 
 
@@ -196,7 +195,7 @@ class Skeleton:
             image: 2D path of the skeleton on top of the heightmap.
         """
         print("[Skeleton] Start mapping the skeleton...")
-        # editor = Editor(config)
+        # editor = Editor()
 
         # buildArea = editor.getBuildArea()
         # buildRect = buildArea.toRect()
@@ -204,7 +203,7 @@ class Skeleton:
         # xzDistance = (max(buildRect.end[0], buildRect.begin[0]) - min(buildRect.end[0], buildRect.begin[0]),
         #              max(buildRect.end[1], buildRect.begin[1]) - min(buildRect.end[1], buildRect.begin[1]))
 
-        heightmap = img.open(
+        heightmap = Image.open(
             "./world_maker/data/heightmap.png").convert('RGB')
         # roadsArea = Image.new("L", xzDistance, 0)
         # width, height = heightmap.size
@@ -265,9 +264,9 @@ class Skeleton:
 
     def road_area(self, name: str, radius: int = 10) -> Image:
         print("[Skeleton] Start mapping the road area...")
-        heightmap = img.open("./world_maker/data/heightmap.png")
+        heightmap = Image.open("./world_maker/data/heightmap.png")
         width, height = heightmap.size
-        road_area_map = img.new("L", (width, height), 0)
+        road_area_map = Image.new("L", (width, height), 0)
         road_area_map_draw = ImageDraw.Draw(road_area_map)
 
         # Lines

world_maker/World.py

@@ -2,7 +2,6 @@ from gdpc import Editor, geometry, lookup
 import numpy as np
 from PIL import Image
 from world_maker.Block import Block
-import config
 
 waterBiomes = [
     "minecraft:ocean",
@@ -27,13 +26,11 @@ waterBlocks = [
 class World:
     def __init__(self):
 
-        editor = Editor(host=config.getHost(), buffering=True)
+        editor = Editor(buffering=True)
         buildArea = editor.getBuildArea()
 
-        self.coordinates_min = [
+        self.coordinates_min = [min(buildArea.begin[i], buildArea.last[i]) for i in range(3)]
-            min(buildArea.begin[i], buildArea.last[i]) for i in range(3)]
+        self.coordinates_max = [max(buildArea.begin[i], buildArea.last[i]) for i in range(3)]
-        self.coordinates_max = [
-            max(buildArea.begin[i], buildArea.last[i]) for i in range(3)]
 
         self.length_x = self.coordinates_max[0] - self.coordinates_min[0] + 1
         self.length_y = self.coordinates_max[1] - self.coordinates_min[1] + 1
@@ -65,15 +62,14 @@ class World:
         Add block or list of block to the volume.
         """
 
-        self.volume[volumeCoordinates[0]][volumeCoordinates[1]
+        self.volume[volumeCoordinates[0]][volumeCoordinates[1]][volumeCoordinates[2]] = None
-                                          ][volumeCoordinates[2]] = None
 
     def getBlockFromCoordinates(self, coordinates):
         """
         Use already created volume to get block data.
         """
 
-        editor = Editor(host=config.getHost(), buffering=True)
+        editor = Editor(buffering=True)
         if self.volume[coordinates[0] - self.coordinates_min[0]][coordinates[1] - self.coordinates_min[1]][
             coordinates[2] - self.coordinates_min[2]] == None:
             self.volume[coordinates[0] - self.coordinates_min[0]][coordinates[1] - self.coordinates_min[1]][
@@ -89,31 +85,28 @@ class World:
             for j in range(-1, 2):
                 for k in range(-1, 2):
                     if not (i == 0 and j == 0 and k == 0):
-                        coordinates = (
+                        coordinates = (Block.coordinates[0] + i, Block.coordinates[1] + j, Block.coordinates[2] + k)
-                            Block.coordinates[0] + i, Block.coordinates[1] + j, Block.coordinates[2] + k)
                         if self.isInVolume(coordinates):
-                            Block.addNeighbors(
+                            Block.addNeighbors([self.getBlockFromCoordinates(coordinates)])
-                                [self.getBlockFromCoordinates(coordinates)])
 
     def setVolume(self):
         """
         Scan the world with no optimization. Not tested on large areas.
         """
 
-        editor = Editor(host=config.getHost(), buffering=True)
+        editor = Editor(buffering=True)
 
         for x in range(self.coordinates_min[0], self.coordinates_max[0] + 1):
             for y in range(self.coordinates_min[1], self.coordinates_max[1] + 1):
                 for z in range(self.coordinates_min[2], self.coordinates_max[2] + 1):
-                    self.addBlocks(
+                    self.addBlocks([Block((x, y, z), editor.getBlock((x, y, z)).id)])
-                        [Block((x, y, z), editor.getBlock((x, y, z)).id)])
 
     def getData(self):
         """
         Generate all needed datas for the generator : heightmap, watermap, and preset the volume with data from the heightmap.
         """
 
-        editor = Editor(host=config.getHost())
+        editor = Editor()
         buildArea = editor.getBuildArea()
         buildRect = buildArea.toRect()
 
@@ -127,10 +120,8 @@ class World:
 
         slice = editor.loadWorldSlice(buildRect)
 
-        heightmapData = list(
+        heightmapData = list(np.array(slice.heightmaps["MOTION_BLOCKING_NO_LEAVES"], dtype=np.uint8))
-            np.array(slice.heightmaps["MOTION_BLOCKING_NO_LEAVES"], dtype=np.uint16))
+        treesmapData = list(np.array(slice.heightmaps["MOTION_BLOCKING"], dtype=np.uint8))
-        treesmapData = list(
-            np.array(slice.heightmaps["MOTION_BLOCKING"], dtype=np.uint16))
 
         for x in range(0, xzDistance[0]):
             for z in range(0, xzDistance[1]):
@@ -157,8 +148,7 @@ class World:
 
                                     # print('getData for tree', xzStart[0] + x + i, k, xzStart[1] + z + j)
 
-                                    blockNeighbor = slice.getBlock(
+                                    blockNeighbor = slice.getBlock((x + i, k, z + j))
-                                        (x + i, k, z + j))
                                     if blockNeighbor.id not in lookup.TREES:
                                         height += k
                                         number += 1
@@ -172,15 +162,13 @@ class World:
                 else:
                     watermap.putpixel((x, z), 0)
 
-                # y set to 100 for 2D
+                self.addBlocks([Block((xzStart[0] + x, 100, xzStart[1] + z), block)])  # y set to 100 for 2D
-                self.addBlocks(
-                    [Block((xzStart[0] + x, 100, xzStart[1] + z), block)])
 
         return heightmap, watermap, treesmap
 
     def propagate(self, coordinates, scanned=[]):
         i = 0
-        editor = Editor(host=config.getHost(), buffering=True)
+        editor = Editor(buffering=True)
         if self.isInVolume(coordinates):
             Block = self.getBlockFromCoordinates(coordinates)
             self.getNeighbors(Block)
@@ -213,7 +201,7 @@ class World:
         Args:
             mask (image): white or black image : combined watermap smoothed and sobel smoothed.
         """
-        editor = Editor(host=config.getHost())
+        editor = Editor()
         buildArea = editor.getBuildArea()
         buildRect = buildArea.toRect()
 
@@ -225,8 +213,7 @@ class World:
 
         slice = editor.loadWorldSlice(buildRect)
 
-        heightmapData = list(
+        heightmapData = list(np.array(slice.heightmaps["MOTION_BLOCKING_NO_LEAVES"], dtype=np.uint8))
-            np.array(slice.heightmaps["MOTION_BLOCKING_NO_LEAVES"], dtype=np.uint8))
 
         for x in range(0, xzDistance[0]):
             for z in range(0, xzDistance[1]):

world_maker/terraforming.py

@@ -2,41 +2,52 @@ from typing import Union
 
 import numpy as np
 from gdpc import Editor, Block, geometry, lookup
-from PIL       import Image as img
+from PIL import Image
-from PIL.Image import Image
 from skimage import morphology
-import config
 
 from world_maker.data_analysis import handle_import_image
 
 
 def remove_trees(heightmap: Union[str, Image], treesmap: Union[str, Image], mask: Union[str, Image]):
     print("[Remove tree] Starting...")
-    editor = Editor(host=config.getHost(), buffering=True)
+    editor = Editor(buffering=True)
     build_area = editor.getBuildArea()
     build_rectangle = build_area.toRect()
 
     start = build_rectangle.begin
 
-    distance = (max(build_rectangle.end[0], build_rectangle.begin[0]) - min(build_rectangle.end[0], build_rectangle.begin[0]),
+    distance = (max(build_rectangle.end[0], build_rectangle.begin[0]) - min(build_rectangle.end[0], build_rectangle.begin[0]), max(
-                max(build_rectangle.end[1], build_rectangle.begin[1]) - min(build_rectangle.end[1], build_rectangle.begin[1]))
+        build_rectangle.end[1], build_rectangle.begin[1]) - min(build_rectangle.end[1], build_rectangle.begin[1]))
 
     heightmap = handle_import_image(heightmap).convert('L')
     treesmap = handle_import_image(treesmap).convert('L')
     mask = handle_import_image(mask)
 
-    removed_treesmap = img.new("L", distance, 0)
+    removed_treesmap = Image.new("L", distance, 0)
 
-    for (x, z) in [(x, z) for x in range(distance[0]) for z in range(distance[1])] :
+    removed = []
+    for x in range(0, distance[0]):
+        for z in range(0, distance[1]):
 
-        if mask.getpixel((x, z)) != 0 and treesmap.getpixel((x, z)) > 0:
+            if mask.getpixel((x, z)) != 0 and treesmap.getpixel((x, z)) > 0 and (x, z) not in removed:
 
                 tree_area = morphology.flood(treesmap, (z, x), tolerance=1)
-            removed_treesmap = img.fromarray(np.where(tree_area, treesmap, 0).astype(np.uint8))
+                blend = Image.blend(Image.fromarray(tree_area).convert(
+                    'L'), removed_treesmap.convert('L'), 0.5)
 
+                array = np.array(blend.convert('L'))
+                bool_array = array > 1
+                removed_treesmap = Image.fromarray(bool_array)
+
+                removed.append((x, z))
+
+    for x in range(0, distance[0]):
+        for z in range(0, distance[1]):
+            if removed_treesmap.getpixel((x, z)) != 0:
                 y = heightmap.getpixel((x, z))
                 y_top = removed_treesmap.getpixel((x, z))
-            geometry.placeLine(editor, (start[0] + x, y+1, start[1] + z), (start[0] + x, y_top, start[1] + z), Block('air'))
+                geometry.placeLine(
+                    editor, (start[0] + x, y+1, start[1] + z), (start[0] + x, y_top, start[1] + z), Block('air'))
 
     removed_treesmap.save('./world_maker/data/removed_treesmap.png')
     print("[Remove tree] Done.")
@@ -45,45 +56,45 @@ def remove_trees(heightmap: Union[str, Image], treesmap: Union[str, Image], mask
 def smooth_terrain(heightmap: Union[str, Image], heightmap_smooth: Union[str, Image], mask: Union[str, Image]):
 
     print("[Smooth terrain] Starting...")
-    editor = Editor(host=config.getHost(), buffering=True)
+    editor = Editor(buffering=True)
     build_area = editor.getBuildArea()
     build_rectangle = build_area.toRect()
 
     start = build_rectangle.begin
 
-    distance = (max(build_rectangle.end[0], build_rectangle.begin[0]) - min(build_rectangle.end[0], build_rectangle.begin[0]),
+    distance = (max(build_rectangle.end[0], build_rectangle.begin[0]) - min(build_rectangle.end[0], build_rectangle.begin[0]), max(
-                max(build_rectangle.end[1], build_rectangle.begin[1]) - min(build_rectangle.end[1], build_rectangle.begin[1]))
+        build_rectangle.end[1], build_rectangle.begin[1]) - min(build_rectangle.end[1], build_rectangle.begin[1]))
 
     heightmap = handle_import_image(heightmap).convert('L')
     heightmap_smooth = handle_import_image(heightmap_smooth).convert('L')
     mask = handle_import_image(mask).convert('L')
 
-    smooth_terrain_delta = img.new("RGB", distance, 0)
+    smooth_terrain_delta = Image.new("RGB", distance, 0)
 
     slice = editor.loadWorldSlice(build_rectangle)
     smoothable_blocks = lookup.OVERWORLD_SOILS | lookup.OVERWORLD_STONES | lookup.SNOWS
 
-    for (x, z) in [(x, z) for x in range(distance[0]) for z in range(distance[1])] :
+    for x in range(0, distance[0]):
+        for z in range(0, distance[1]):
 
-        if mask.getpixel((x, z)) == 0:
+            if mask.getpixel((x, z)) != 0:
-            continue
                 y = heightmap.getpixel((x, z))
                 y_smooth = heightmap_smooth.getpixel((x, z))
                 delta = y - y_smooth
                 smooth_terrain_delta.putpixel((x, z), delta)
 
-        if delta == 0:
+                if delta != 0:
-            continue
                     block = slice.getBlock((x, y, z))
-
+                    if block.id in smoothable_blocks:
-        if block.id not in smoothable_blocks:
-            continue
                         if delta > 0:
-            geometry.placeLine(editor, (start[0] + x, y, start[1] + z), (start[0] + x, y_smooth, start[1] + z), Block('air'))
+                            geometry.placeLine(
-            editor.placeBlock((start[0] + x, y_smooth, start[1] + z), block)
+                                editor, (start[0] + x, y, start[1] + z), (start[0] + x, y_smooth, start[1] + z), Block('air'))
+                            editor.placeBlock(
+                                (start[0] + x, y_smooth, start[1] + z), block)
 
                         else:
-            geometry.placeLine(editor, (start[0] + x, y, start[1] + z), (start[0] + x, y_smooth, start[1] + z), block)
+                            geometry.placeLine(
+                                editor, (start[0] + x, y, start[1] + z), (start[0] + x, y_smooth, start[1] + z), block)
 
     smooth_terrain_delta.save('./world_maker/data/smooth_terrain_delta.png')
     print("[Smooth terrain] Done.")