Skip to content

Commit

Permalink
update world
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasjackson committed Mar 4, 2024
1 parent aeb410d commit 0ca0af8
Show file tree
Hide file tree
Showing 24 changed files with 230 additions and 10 deletions.
1 change: 1 addition & 0 deletions jumppad/config/db_secrets/password
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
password
21 changes: 12 additions & 9 deletions jumppad/main.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ resource "container" "minecraft" {
}

network {
id = resource.network.local.id
id = resource.network.local.meta.id
}

# Minecraft
Expand All @@ -81,12 +81,12 @@ resource "container" "minecraft" {
RCON_PASSWORD = "password"
SPAWN_ANIMALS = "true"
SPAWN_NPCS = "true"
VAULT_ADDR = "http://vault.container.jumppad.dev:8200"
VAULT_ADDR = "http://vault.container.local.jmpd.in:8200"
VAULT_TOKEN = "root"
HASHICRAFT_env = "local"
MICROSERVICES_db_host = "postgres.container.jumppad.dev:5432"
MICROSERVICES_db_password = "password"
MICROSERVICES_db_database = "mydb"
MICROSERVICES_db_host = "postgres.container.local.jmpd.in:5432"
MICROSERVICES_db_password = resource.container.postgres.environment.POSTGRES_PASSWORD
MICROSERVICES_db_database = resource.container.postgres.environment.POSTGRES_DB
SRE_BOT_START = "86,67,-64"
SRE_BOT_END = "86,67,-69"
}
Expand Down Expand Up @@ -121,15 +121,18 @@ resource "container" "minecraft" {
}

resource "container" "postgres" {
network {
id = resource.network.local.meta.id
}

image {
name = "postgres:15.4"
}

port {
local = 5432
remote = 5432
host = 5432
open_in_browser = ""
local = 5432
remote = 5432
host = 5432
}

environment = {
Expand Down
Binary file modified jumppad/minecraft/world/DIM-1/data/raids.dat
Binary file not shown.
Binary file modified jumppad/minecraft/world/DIM1/data/raids_end.dat
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
{
"minecraft:recipes/decorations/crafting_table": {
"criteria": {
"unlock_right_away": "2024-03-04 08:57:59 +0000"
},
"done": true
},
"minecraft:adventure/adventuring_time": {
"criteria": {
"minecraft:beach": "2024-03-04 08:58:23 +0000",
"minecraft:river": "2024-03-04 08:58:21 +0000",
"minecraft:old_growth_birch_forest": "2024-03-04 08:58:00 +0000"
},
"done": false
},
"minecraft:recipes/building_blocks/lime_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/transportation/detector_rail": {
"criteria": {
"has_rail": "2024-03-04 09:27:43 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/light_gray_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/pink_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/decorations/orange_bed": {
"criteria": {
"has_orange_wool": "2024-03-04 09:27:22 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/orange_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/decorations/orange_banner": {
"criteria": {
"has_orange_wool": "2024-03-04 09:27:22 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/red_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/magenta_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/brown_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/light_blue_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/glass": {
"criteria": {
"has_smelts_to_glass": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/redstone/redstone_torch": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/green_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/tools/clock": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/decorations/painting": {
"criteria": {
"has_wool": "2024-03-04 09:27:22 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/blue_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/redstone/dropper": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/yellow_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/sandstone": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/white_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/redstone/redstone_block": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/gray_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/black_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/redstone/note_block": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/purple_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/decorations/orange_carpet": {
"criteria": {
"has_orange_wool": "2024-03-04 09:27:22 +0000"
},
"done": true
},
"minecraft:recipes/redstone/target": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/transportation/activator_rail": {
"criteria": {
"has_rail": "2024-03-04 09:27:43 +0000"
},
"done": true
},
"minecraft:recipes/building_blocks/cyan_concrete_powder": {
"criteria": {
"has_sand": "2024-03-04 09:27:04 +0000"
},
"done": true
},
"minecraft:recipes/tools/compass": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"minecraft:recipes/transportation/powered_rail": {
"criteria": {
"has_rail": "2024-03-04 09:27:43 +0000"
},
"done": true
},
"minecraft:recipes/redstone/piston": {
"criteria": {
"has_redstone": "2024-03-04 09:31:59 +0000"
},
"done": true
},
"DataVersion": 3465
}
Binary file modified jumppad/minecraft/world/data/raids.dat
Binary file not shown.
Binary file modified jumppad/minecraft/world/data/random_sequences.dat
Binary file not shown.
Binary file modified jumppad/minecraft/world/entities/r.-1.-1.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/entities/r.-1.0.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/entities/r.0.-1.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/entities/r.0.0.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/level.dat
Binary file not shown.
Binary file modified jumppad/minecraft/world/level.dat_old
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified jumppad/minecraft/world/poi/r.0.-1.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/region/r.-1.-1.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/region/r.-1.0.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/region/r.0.-1.mca
Binary file not shown.
Binary file modified jumppad/minecraft/world/region/r.0.0.mca
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"stats":{"minecraft:custom":{"minecraft:jump":81,"minecraft:time_since_rest":35227,"minecraft:play_time":35227,"minecraft:sprint_one_cm":62221,"minecraft:time_since_death":35227,"minecraft:walk_on_water_one_cm":97581,"minecraft:walk_one_cm":1744,"minecraft:total_world_time":35227,"minecraft:walk_under_water_one_cm":4034,"minecraft:fly_one_cm":6078}},"DataVersion":3465}
{"stats":{"minecraft:custom":{"minecraft:jump":81,"minecraft:time_since_rest":105691,"minecraft:play_time":105691,"minecraft:sprint_one_cm":105125,"minecraft:time_since_death":105691,"minecraft:walk_on_water_one_cm":97581,"minecraft:walk_one_cm":6588,"minecraft:total_world_time":105691,"minecraft:walk_under_water_one_cm":4034,"minecraft:fly_one_cm":6078}},"DataVersion":3465}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"stats":{"minecraft:used":{"minecraft:powered_rail":1,"minecraft:orange_wool":48,"minecraft:chest_minecart":1,"minecraft:sand":4,"minecraft:rail":20,"minecraft:hopper":4,"minecraft:redstone":6},"minecraft:custom":{"minecraft:jump":19,"minecraft:time_since_rest":17937,"minecraft:inspect_hopper":7,"minecraft:leave_game":1,"minecraft:play_time":17937,"minecraft:time_since_death":17937,"minecraft:walk_one_cm":28945,"minecraft:total_world_time":17937,"minecraft:fly_one_cm":18603},"minecraft:picked_up":{"microservices:data_item":1}},"DataVersion":3465}

0 comments on commit 0ca0af8

Please sign in to comment.