Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
url = https://github.com/fluxionary/minetest-futil
[submodule "mods/stubes"]
path = mods/stubes
url = https://github.com/TheEt1234/luanti-stubes
url = https://codeberg.org/skyblock_zero/stubes
[submodule "mods/extended_placement"]
path = mods/extended_placement
url = https://github.com/gamefreq0/extended_placement
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Release 42
- Added a setting that toggles the welcome message
- Seperated submodule contributions from sbz contributions in credits, so that people that have nothing to do with sbz don't get confused
- Added wormholes
- Fix crash with questbooks in node breakers
- Stubes (still hidden):
- Moved to codeberg
- Added the ability to put items and take away items by a player
- (Hopefully) fixed a crash

# Release 40
- Development resumed again!
- We are still looking for contributors, if you enjoy SBZ and want to contribute, please do so!
Expand Down
5 changes: 0 additions & 5 deletions docs/areas.txt

This file was deleted.

9 changes: 0 additions & 9 deletions docs/for server owners/anticheat.txt

This file was deleted.

6 changes: 0 additions & 6 deletions docs/for server owners/clearobjects.txt

This file was deleted.

10 changes: 0 additions & 10 deletions docs/for server owners/corrupted machine.txt

This file was deleted.

13 changes: 0 additions & 13 deletions docs/for server owners/monitoring.txt

This file was deleted.

1 change: 0 additions & 1 deletion docs/for server owners/recomended mods.txt

This file was deleted.

1 change: 0 additions & 1 deletion docs/for server owners/skinsdb.txt

This file was deleted.

33 changes: 0 additions & 33 deletions docs/quests.md

This file was deleted.

15 changes: 11 additions & 4 deletions mods/sbz_base/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ sbz_api = {
accelerated_habitats = false,
debug = core.settings:get_bool('sbz_debug', false),
logic_gate_linking_range = 15,
welcome_messages = core.settings:get_bool('sbz_welcome_message', true),
}

if sbz_api.server_optimizations == 'auto' then
Expand Down Expand Up @@ -265,10 +266,16 @@ core.register_chatcommand('bgm_volume', {
core.register_on_joinplayer(function(player)
local player_name = player:get_player_name()
-- send welcome messages
core.chat_send_player(player_name, sbz_api.get_simple_version_string())
core.chat_send_player(player_name, '‼ reminder: If you fall off, use /core to teleport back to the core.')
core.chat_send_player(player_name, '‼ reminder: If lose your Quest Book, use /qb to get it back.')
core.chat_send_player(player_name, '!! If you have any suggestions/bug reports to Skyblock Zero, see /community')

if sbz_api.welcome_messages then
core.chat_send_player(player_name, sbz_api.get_simple_version_string())
core.chat_send_player(player_name, '‼ reminder: If you fall off, use /core to teleport back to the core.')
core.chat_send_player(player_name, '‼ reminder: If lose your Quest Book, use /qb to get it back.')
core.chat_send_player(
player_name,
'!! If you have any suggestions/bug reports to Skyblock Zero, see /community'
)
end

-- play bgm
playRandomBGM(player)
Expand Down
41 changes: 14 additions & 27 deletions mods/sbz_pipeworks/filter_injector.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,15 @@ minetest.register_node('pipeworks:automatic_filter_injector', {
set_filter_formspec(meta)
end,
after_place_node = function(pos, placer, itemstack, pointed_thing)
minetest.get_meta(pos):set_string('owner', placer:get_player_name())

if placer and pointed_thing and pointed_thing.type == "node" then
-- Face away from the clicked block
local dir = vector.subtract(pointed_thing.above, pointed_thing.under)
dir = vector.multiply(dir, -1)

-- Get base param2 from direction
local param2 = minetest.dir_to_facedir(dir, true)

-- Manual correction offset for facing direction
local CORRECTION_OFFSET = 1
param2 = (param2 + CORRECTION_OFFSET) % 24

local node = minetest.get_node(pos)
node.param2 = param2
minetest.swap_node(pos, node)
else
local node = minetest.get_node(pos)
node.param2 = node.param2 + 1
minetest.swap_node(pos, node)
core.get_meta(pos):set_string('owner', placer:get_player_name())

if pointed_thing and pointed_thing.above then
local face = vector.subtract(pointed_thing.above, pointed_thing.under)
face = -face
local node = core.get_node(pos)
node.param2 = core.dir_to_facedir(face, true) + 1
core.swap_node(pos, node)
end

pipeworks.after_place(pos)
end,
after_dig_node = pipeworks.after_dig,
Expand Down Expand Up @@ -410,10 +396,10 @@ minetest.register_node('pipeworks:automatic_filter_injector', {
})

do
local MB = "sbz_resources:matter_blob"
local RA = "sbz_resources:robotic_arm"
local RC = "sbz_resources:retaining_circuit"
local T1 = "pipeworks:tube_1"
local MB = 'sbz_resources:matter_blob'
local RA = 'sbz_resources:robotic_arm'
local RC = 'sbz_resources:retaining_circuit'
local T1 = 'pipeworks:tube_1'
minetest.register_craft {
output = 'pipeworks:automatic_filter_injector 4',
recipe = {
Expand All @@ -422,4 +408,5 @@ do
{ MB, MB, MB },
},
}
end
end

9 changes: 3 additions & 6 deletions mods/sbz_pipeworks/wielder.lua
Original file line number Diff line number Diff line change
Expand Up @@ -136,25 +136,22 @@ function pipeworks.register_wielder(def)
if def.eject_drops then inv:set_size('main', 32) end
set_wielder_formspec(def, meta)
end,
on_place = function(itemstack, placer, pointed_thing)
-- Use default placement
return minetest.item_place(itemstack, placer, pointed_thing)
end,

after_place_node = function(pos, placer, itemstack, pointed_thing)
-- Update the pipe network connections
pipeworks.scan_for_tube_objects(pos)
if not placer or not pointed_thing or pointed_thing.type ~= 'node' then return end
if not placer then return end

minetest.get_meta(pos):set_string('owner', placer:get_player_name())
if not pointed_thing or pointed_thing.type ~= 'node' then return end

-- Rotate to face the clicked block
local dir = vector.subtract(pointed_thing.above, pointed_thing.under)
local param2 = minetest.dir_to_facedir(dir, true)

local node = minetest.get_node(pos)
node.param2 = param2
minetest.set_node(pos, node)
minetest.swap_node(pos, node)
end,
after_dig_node = function(pos, oldnode, oldmetadata, digger)
local digger_inv = digger:get_inventory()
Expand Down
27 changes: 20 additions & 7 deletions mods/sbz_progression/questbook.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ end
-- Function to create the formspec
local function get_questbook_formspec(selected_quest_index, player_name, quests_to_show, search_text)
local player_ref = core.get_player_by_name(player_name)
sbz_api.ui.set_player(player_ref)
if not player_ref then return '' end
sbz_api.ui.set_player(player_ref)

local selected_quest = quests_to_show[selected_quest_index]
local quest_count = #quests -- we subtract uncompletable quests from this later, like infotexts
Expand Down Expand Up @@ -143,9 +143,9 @@ local function get_questbook_formspec(selected_quest_index, player_name, quests_
ins(pal.bright_purple)

-- just for the credits quest
if (quest.istoplevel) then
if quest.istoplevel then
ins '0'
else
else
ins(default_indent)
end

Expand All @@ -156,9 +156,9 @@ local function get_questbook_formspec(selected_quest_index, player_name, quests_
ins(pal.bright_purple)

-- just for the credits quest
if (quest.istoplevel) then
if quest.istoplevel then
ins '0'
else
else
ins(default_indent)
end

Expand Down Expand Up @@ -192,7 +192,20 @@ local function get_questbook_formspec(selected_quest_index, player_name, quests_
tooltip[font_add;Makes font larger]
tooltip[font_sub;Makes font smaller]
]]):format(
sbz_api.ui.hypertext(0.3, 0.25, 5.6, 0.5, '', "Quest List (✓ " .. completed_count .. " / ► " ..available_count.." / ✕ " .. (quest_count - completed_count) .. ")"),
sbz_api.ui.hypertext(
0.3,
0.25,
5.6,
0.5,
'',
'Quest List (✓ '
.. completed_count
.. ' / ► '
.. available_count
.. ' / ✕ '
.. (quest_count - completed_count)
.. ')'
),
sbz_api.ui.box_shadow(0.2, 0.7, 5.6, 11.3, 2),
table_style,
quest_list,
Expand Down Expand Up @@ -271,7 +284,7 @@ local function get_questbook_formspec(selected_quest_index, player_name, quests_
end

if available_count == 1 and (quest_count - completed_count) == 1 then
unlock_achievement(player_name, "Credits")
unlock_achievement(player_name, 'Credits')

-- okay let me explain
-- this will be called only once
Expand Down
2 changes: 1 addition & 1 deletion mods/sbz_resources/nodes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ minetest.register_node(
unifieddyes.def {
description = 'Bricks',
tiles = { 'bricks.png' },
drawtype = 'color',
paramtype2 = 'color',
groups = {
matter = 1,
charged = 1,
Expand Down
2 changes: 1 addition & 1 deletion mods/stubes
Submodule stubes updated from 46fb86 to 4e8464
2 changes: 2 additions & 0 deletions settingtypes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ sbz_debug (Debug Logging) bool false
# If enabled, it may cause some features behave in an unexpected way.
# If not neabled, this may cause performance issues on large worlds or on servers.
sbz_switching_station_unload (Automatically unload switching stations) enum default default,always,never

sbz_welcome_message (Enable the welcome message) bool true