diff --git a/config-sample.json b/config-sample.json index 0952db2..849d021 100644 --- a/config-sample.json +++ b/config-sample.json @@ -5,7 +5,6 @@ "user": "", "password": "" }, - "database-tables": { "coreprotect_blocks": "co_block", "coreprotect_users": "co_user", @@ -13,7 +12,6 @@ "whimc_positions": "whimc_player_positions", "whimc_observations": "whimc_observations" }, - "imgur": { "client_id": "", "client_secret": "", @@ -21,12 +19,11 @@ "refresh_token": "", "album_id": "" }, - "worlds": [ { "display_name": "Rocket Launch", "world_name": "RocketLaunch", - "coreprotect_id": 0, + "coreprotect_id": 15, "image_path": "maps/RocketLaunch.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -1731, @@ -35,7 +32,7 @@ { "display_name": "Lunar Crater", "world_name": "LunarCrater", - "coreprotect_id": 0, + "coreprotect_id": 11, "image_path": "maps/LunarCrater.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -222, @@ -44,7 +41,7 @@ { "display_name": "Space Station", "world_name": "Hub", - "coreprotect_id": 0, + "coreprotect_id": 1, "image_path": "maps/SpaceStation.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -155, @@ -53,7 +50,7 @@ { "display_name": "Earth Control", "world_name": "EarthControl", - "coreprotect_id": 0, + "coreprotect_id": 10, "image_path": "maps/EarthControl.png", "pixel_to_block_ratio": 1.0, "top_left_coordinate_x": -251, @@ -62,7 +59,7 @@ { "display_name": "No Moon", "world_name": "NoMoon", - "coreprotect_id": 0, + "coreprotect_id": 9, "image_path": "maps/NoMoon.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -325, @@ -71,7 +68,7 @@ { "display_name": "Colder Sun (Habitable Strip)", "world_name": "ColderStrip", - "coreprotect_id": 0, + "coreprotect_id": 68, "image_path": "maps/ColderStrip.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -227, @@ -80,7 +77,7 @@ { "display_name": "Colder Sun (Cold)", "world_name": "ColderCold", - "coreprotect_id": 0, + "coreprotect_id": 72, "image_path": "maps/ColderCold.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -219, @@ -89,7 +86,7 @@ { "display_name": "Colder Sun (Hot)", "world_name": "ColderHot", - "coreprotect_id": 0, + "coreprotect_id": 65, "image_path": "maps/ColderHot.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -302, @@ -98,34 +95,34 @@ { "display_name": "Tilted Earth (Frozen)", "world_name": "TiltedFrozen", - "coreprotect_id": 0, - "image_path": "maps/TiltedFrozen.png", - "pixel_to_block_ratio": 2.0, + "coreprotect_id": 76, + "image_path": "maps/TiltedEarthFrozen-3.3px-to-1block.png", + "pixel_to_block_ratio": 3.3, "top_left_coordinate_x": -730, "top_left_coordinate_z": -880 }, { "display_name": "Tilted Earth (Warm)", "world_name": "TiltedWarm", - "coreprotect_id": 0, - "image_path": "maps/TiltedWarm.png", - "pixel_to_block_ratio": 2.0, + "coreprotect_id": 71, + "image_path": "maps/TiltedEarthJungle-3.3px-to-1block.png", + "pixel_to_block_ratio": 3.3, "top_left_coordinate_x": -730, "top_left_coordinate_z": -880 }, { "display_name": "Tilted Earth (Melting)", "world_name": "TiltedMelting", - "coreprotect_id": 0, - "image_path": "maps/TiltedMelting.png", - "pixel_to_block_ratio": 2.0, + "coreprotect_id": 2, + "image_path": "maps/TiltedEarthMelting-4px-to-1block.png", + "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -730, "top_left_coordinate_z": -880 }, { "display_name": "Mynoa (Close)", "world_name": "MynoaClose", - "coreprotect_id": 0, + "coreprotect_id": 67, "image_path": "maps/MynoaClose.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": 1218, @@ -134,7 +131,7 @@ { "display_name": "Mynoa (Half)", "world_name": "MynoaHalf", - "coreprotect_id": 0, + "coreprotect_id": 70, "image_path": "maps/MynoaHalf.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -128, @@ -143,7 +140,7 @@ { "display_name": "Mynoa (Far)", "world_name": "MynoaFar", - "coreprotect_id": 0, + "coreprotect_id": 66, "image_path": "maps/MynoaFar.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -81, @@ -152,7 +149,7 @@ { "display_name": "Cancri", "world_name": "Cancri", - "coreprotect_id": 0, + "coreprotect_id": 18, "image_path": "maps/Cancri.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -21, @@ -161,7 +158,7 @@ { "display_name": "Cancri Cold", "world_name": "CancriCold", - "coreprotect_id": 0, + "coreprotect_id": 69, "image_path": "maps/CancriCold.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -100, @@ -170,7 +167,7 @@ { "display_name": "Gliese", "world_name": "Gliese", - "coreprotect_id": 0, + "coreprotect_id": 19, "image_path": "maps/Gliese.png", "pixel_to_block_ratio": 1.0, "top_left_coordinate_x": -314, @@ -179,7 +176,7 @@ { "display_name": "Trappist", "world_name": "Trappist", - "coreprotect_id": 0, + "coreprotect_id": 17, "image_path": "maps/Trappist.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -250, @@ -188,7 +185,7 @@ { "display_name": "Kepler", "world_name": "Kepler", - "coreprotect_id": 0, + "coreprotect_id": 30, "image_path": "maps/Kepler.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -512, @@ -197,7 +194,7 @@ { "display_name": "Brown Dwarf", "world_name": "BrownDwarf", - "coreprotect_id": 0, + "coreprotect_id": 29, "image_path": "maps/BrownDwarf.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -301, @@ -206,7 +203,7 @@ { "display_name": "Two Moons", "world_name": "TwoMoons", - "coreprotect_id": 0, + "coreprotect_id": 36, "image_path": "maps/TwoMoons.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -70, @@ -215,7 +212,7 @@ { "display_name": "Two Moons (Lluna)", "world_name": "TwoMoonsLluna", - "coreprotect_id": 0, + "coreprotect_id": 43, "image_path": "maps/TwoMoonsLluna.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -100, @@ -224,7 +221,7 @@ { "display_name": "Two Moons (Low)", "world_name": "TwoMoonsLow", - "coreprotect_id": 0, + "coreprotect_id": 38, "image_path": "maps/TwoMoonsLow.png", "pixel_to_block_ratio": 4.0, "top_left_coordinate_x": -70, @@ -233,7 +230,7 @@ { "display_name": "Black Hole", "world_name": "BlackHole", - "coreprotect_id": 0, + "coreprotect_id": 48, "image_path": "maps/BlackHole.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -280, @@ -242,7 +239,7 @@ { "display_name": "ET Life", "world_name": "ETLife", - "coreprotect_id": 0, + "coreprotect_id": 27, "image_path": "maps/ETLife.png", "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -49, @@ -257,6 +254,15 @@ "top_left_coordinate_x": -1024, "top_left_coordinate_z": -512 }, + { + "display_name": "Mars Barrelbot", + "world_name": "Barrelbotdev", + "coreprotect_id": 110, + "image_path": "maps/Barrelbot.png", + "pixel_to_block_ratio": 2.0, + "top_left_coordinate_x": -1024, + "top_left_coordinate_z": -1024 + }, { "display_name": "Mars sdp7", "world_name": "sdp7", @@ -274,6 +280,15 @@ "pixel_to_block_ratio": 2.0, "top_left_coordinate_x": -1024, "top_left_coordinate_z": -512 + }, + { + "display_name": "Play", + "world_name": "play", + "coreprotect_id": 89, + "image_path": "maps/Play.png", + "pixel_to_block_ratio": 1.0, + "top_left_coordinate_x": 768, + "top_left_coordinate_z": 768 } ] } diff --git a/maps/Barrelbot.png b/maps/Barrelbot.png new file mode 100644 index 0000000..0289a41 Binary files /dev/null and b/maps/Barrelbot.png differ diff --git a/maps/Play.png b/maps/Play.png new file mode 100644 index 0000000..075dbab Binary files /dev/null and b/maps/Play.png differ diff --git a/maps/TiltedEarthFrozen-3.3px-to-1block.png b/maps/TiltedEarthFrozen-3.3px-to-1block.png new file mode 100644 index 0000000..7992bfd Binary files /dev/null and b/maps/TiltedEarthFrozen-3.3px-to-1block.png differ diff --git a/maps/TiltedEarthJungle-3.3px-to-1block.png b/maps/TiltedEarthJungle-3.3px-to-1block.png new file mode 100644 index 0000000..090c722 Binary files /dev/null and b/maps/TiltedEarthJungle-3.3px-to-1block.png differ diff --git a/maps/TiltedEarthMelting-4px-to-1block.png b/maps/TiltedEarthMelting-4px-to-1block.png new file mode 100644 index 0000000..b042c0a Binary files /dev/null and b/maps/TiltedEarthMelting-4px-to-1block.png differ diff --git a/requirements.txt b/requirements.txt index bd58b31..0efc1f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ Flask==3.0.0 Flask-Cors==4.0.0 Flask-RESTful==0.3.10 markdown2==2.4.12 -gunicorn==21.2.0 +gunicorn==23.0.0