Skip to content

Commit

Permalink
Add separate realms build
Browse files Browse the repository at this point in the history
  • Loading branch information
@NeunEinser
NeunEinser committed Sep 3, 2023
1 parent 4b3398d commit 5036a15
Show file tree
Hide file tree
Showing 5 changed files with 223 additions and 98 deletions.
34 changes: 33 additions & 1 deletion datapack/data/fetchr/functions/init/init.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,16 +384,25 @@ forceload add 0 0
# function fetchr:init/setup_lobby/start
# function fetchr:init/setup_lobby/end
# function fetchr:lobby/place_indestructible_blocks
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.lobby_sign
#>
# @within
# function fetchr:lobby/*
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.multiplayer_only
#>
# @within
# function fetchr:lobby/*
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.no_realms
#>
# @within
# function fetchr:lobby/*
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.multiplayer_only_brown
#>
Expand All @@ -405,124 +414,147 @@ forceload add 0 0
#>
# @within
# function fetchr:lobby/*
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.singleplayer_only
#>
# @within
# function fetchr:lobby/*
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.singleplayer_only_brown
#>
# @within
# function fetchr:lobby/place_sign
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.sign_north
#>
# @within
# function fetchr:lobby/place_sign
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.sign_east
#>
# @within
# function fetchr:lobby/place_sign
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.sign_south
#>
# @within
# function fetchr:lobby/place_sign
# function fetchr:init/setup_lobby/end
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.sign_west
#>
# @within
# function fetchr:lobby/place_sign
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.danger_sign_east
#>
# @within
# function fetchr:lobby/settings/toggle_blind_mode
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.blind_mode_sign
#>
# @within
# function fetchr:lobby/settings/toggle_lockout_mode
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.lockout_mode_sign
#>
# @within
# function fetchr:lobby/settings/toggle_timer_method
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.timer_method_sign
#>
# @within
# function fetchr:lobby/settings/toggle_paused_time
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.paused_time_sign
#>
# @within
# function fetchr:lobby/settings/toggle_operator_only
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.operator_only_sign
#>
# @within
# function fetchr:lobby/settings/toggle_gamemode
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.gamemode_sign
#>
# @within
# function fetchr:lobby/settings/set_pre_gen_radius_internal
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.pre_gen_sign
#>
# @within
# function fetchr:lobby/settings/toggle_allow_spectating
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.allow_spectating_sign
#>
# @within
# function fetchr:lobby/settings/toggle_show_seed
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.show_seed_sign
#>
# @within
# function fetchr:lobby/place_indestructible_blocks
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.multiplayer_door
#>
# @within
# function fetchr:lobby/place_indestructible_blocks
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.mangrove_button_south
#>
# @within
# function fetchr:lobby/place_indestructible_blocks
# function fetchr:init/setup_lobby/*
# structure fetchr:card_generation
#declare tag fetchr.lobby_enderchest
#>
# @within
# function fetchr:init/setup_lobby/start
# function fetchr:init/setup_lobby/end
# function fetchr:lobby/place_indestructible_blocks
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.lobby_lectern
#>
# @within
# function fetchr:lobby/place_lectern
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.lectern_north
#>
# @within
# function fetchr:lobby/place_lectern
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.lectern_east
#>
# @within
# function fetchr:lobby/place_lectern
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.lectern_south
#>
# @within
# function fetchr:lobby/place_lectern
# function fetchr:init/setup_lobby/*
# structure fetchr:*
#declare tag fetchr.lectern_west
#>
Expand Down
10 changes: 10 additions & 0 deletions datapack/data/fetchr/functions/init/setup_lobby/end.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ setblock 7 0 7 minecraft:oak_sign
execute if score $is_multiplayer fetchr.state matches 1 at @e[tag=fetchr.multiplayer_mangrove_button_north] run setblock ~ ~ ~ minecraft:mangrove_button[facing=north]

execute in fetchr:lobby as @e[x=0.5,y=0,z=0.5,type=minecraft:marker, tag=fetchr.string_tester, distance=..0.1, limit=1] run function fetchr:init/items/lobby_loaded
#NEUN_SCRIPT if realms
#kill @e[tag=fetchr.no_realms]
#tag @e remove fetchr.multiplayer_only
#tag @e remove fetchr.singleplayer_only
#execute at @e[tag=fetchr.multiplayer_only_brown] run setblock ~ ~ ~ minecraft:brown_carpet
#execute at @e[tag=fetchr.singleplayer_only_brown] run setblock ~ ~ ~ minecraft:brown_carpet
#tag @e remove fetchr.multiplayer_only_brown
#tag @e remove fetchr.singleplayer_only_brown
#tag @e remove fetchr.multiplayer_mangrove_button_north
#NEUN_SCRIPT end

forceload remove all
forceload add 0 0
Expand Down
Binary file modified datapack/data/fetchr/structures/card_generation.nbt
View file
Binary file not shown.
11 changes: 10 additions & 1 deletion neunscript.config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"target": "dist",
"vars": {
"version_long_name": "5.1 Pre-Release 2",
"rp_version": "20"
"rp_version": "20",
"realms": false
},
"remove_file_types": [
"xcf", "py", "jsonc"
Expand All @@ -23,6 +24,14 @@
"world": {
"path": "world"
},
"versions": {
"realms": {
"vars": {
"realms": true,
"version_long_name": "5.1 (Realms)"
}
}
},
"include": [
"server.properties"
]
Expand Down
Loading

0 comments on commit 5036a15

Please sign in to comment.