Merge pull request #1074 from MihailRis/update-base-pack
Some checks are pending
x86-64 AppImage / build-appimage (ubuntu-22.04) (push) Waiting to run
Build / Build (push) Waiting to run
Macos Build / build-dmg (push) Waiting to run
Windows Build (CLang) / build-windows (clang, windows-latest) (push) Waiting to run
MSVC Build / build-windows (windows-2022) (push) Waiting to run

update base pack
This commit is contained in:
MihailRis 2026-11-22 00:26:07 +03:00 • committed by GitHub
commit d887c8d014
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 170 additions and 44 deletions

View file

@ -0,0 +1,48 @@
{
"abstract": true,
"model": "custom",
"model-name": "stairs",
"rotation": "stairs",
"uv-lock": true,
"hitboxes": [
[0, 0.0, 0, 1, 0.5, 1.0],
[0, 0.5, 0, 1, 0.5, 0.5]
],
"light-passing": true,
"state-based": {
"offset": 0,
"bits": 3,
"variants": [
{
"model-name": "stairs_inner_left",
"hitboxes": [
[0.0, 0.0, 0.0, 1.0, 0.5, 1.0],
[0.0, 0.5, 0.0, 1.0, 0.5, 0.5],
[0.0, 0.5, 0.5, 0.5, 0.5, 0.5]
]
},
{
"model-name": "stairs_inner_right",
"hitboxes": [
[0.0, 0.0, 0.0, 1.0, 0.5, 1.0],
[0.0, 0.5, 0.0, 1.0, 0.5, 0.5],
[0.5, 0.5, 0.5, 0.5, 0.5, 0.5]
]
},
{
"model-name": "stairs_outer_left",
"hitboxes": [
[0.0, 0.0, 0.0, 1.0, 0.5, 1.0],
[0.0, 0.5, 0.0, 0.5, 0.5, 0.5]
]
},
{
"model-name": "stairs_outer_right",
"hitboxes": [
[0.0, 0.0, 0.0, 1.0, 0.5, 1.0],
[0.5, 0.5, 0.0, 0.5, 0.5, 0.5]
]
}
]
}
}

View file

@ -0,0 +1,5 @@
{
"parent": "base:abstract_stairs",
"texture": "brick",
"base:durability": 10.5
}

View file

@ -1,8 +1,6 @@
{
"entities": [
"drop",
"player",
"falling_block"
"items": [
"bazalt_breaker"
],
"blocks": [
"dirt",
@ -30,9 +28,13 @@
"torch",
"wooden_door",
"coal_ore",
"ice"
"ice",
"brick_stairs",
"abstract_stairs"
],
"items": [
"bazalt_breaker"
"entities": [
"drop",
"player",
"falling_block"
]
}

View file

@ -14,5 +14,6 @@
["radius", 0.3],
["radius", 1.6]
],
"blocking": false
"blocking": false,
"translucent": true
}

View file

@ -4,5 +4,6 @@
],
"skeleton-name": "base:block",
"hitbox": [0.98, 0.98, 0.98],
"solid": true
"solid": true,
"translucent": true
}

View file

@ -0,0 +1,65 @@
-- variants
local DEFAULT = 0
local INNER_LEFT = 1
local INNER_RIGHT = 2
local OUTER_LEFT = 3
local OUTER_RIGHT = 4
local function get_stairs_info(id, x, y, z)
if block.get(x, y, z) ~= id then
return nil
end
local zx, _, zz = block.get_Z(x, y, z)
local _, half = block.get_Y(x, y, z)
return -zx, -zz, half
end
local function detect_variant(id, x, y, z)
local bx, bz, half = get_stairs_info(id, x, y, z)
local lx, _, lz = block.get_X(x, y, z)
lx, lz = -lx, -lz
local function is_oriented_same(ox, oz)
local nbx, nbz, nhalf = get_stairs_info(id, x + ox, y, z + oz)
return nbx == bx and nbz == bz and nhalf == half
end
local function corner_side(ox, oz, sign)
local nbx, nbz, nhalf = get_stairs_info(id, x + ox, y, z + oz)
if nbx == nil or nhalf ~= half or nbx * bx + nbz * bz ~= 0 then
return nil
end
if is_oriented_same(nbx * sign, nbz * sign) then
return nil
end
return nbx == lx and nbz == lz
end
local left = corner_side(bx, bz, -1)
if left ~= nil then
return left and OUTER_LEFT or OUTER_RIGHT
end
left = corner_side(-bx, -bz, 1)
if left ~= nil then
return left and INNER_LEFT or INNER_RIGHT
end
return DEFAULT
end
local function refresh(x, y, z, keep_variant)
local variant = detect_variant(block.get(x, y, z), x, y, z)
if keep_variant and variant == DEFAULT then
return
end
if block.get_variant(x, y, z) ~= variant then
block.set_variant(x, y, z, variant)
end
end
function on_placed(x, y, z)
refresh(x, y, z, false)
end
function on_update(x, y, z)
refresh(x, y, z, true)
end

View file

@ -1,4 +1,4 @@
@box from (0,0,0) to (1,0.5,1) delete (top,north)
@box from (0,0.5,0) to (1,1,0.5) delete (bottom,north)
@rect from (0,0.5,0.5) right (1,0,0) up (0,0,0.5) texture "$2"
@rect from (1.0,0.5,1.0) right (-1,0,0) up (0,0,-0.5) texture "$2"
@rect from (0,0,0) right (1,0,0) up (0,1,0) texture "$1"

View file

@ -0,0 +1,3 @@
@box from (0,0,0) to (1,0.5,1)
@box from (0,0.5,0) to (1,1,0.5) delete (bottom)
@box from (0,0.5,0.5) to (0.5,1,1) delete (bottom,north)

View file

@ -0,0 +1,3 @@
@box from (0,0,0) to (1,0.5,1)
@box from (0,0.5,0) to (1,1,0.5) delete (bottom)
@box from (0.5,0.5,0.5) to (1,1,1) delete (bottom,north)

View file

@ -0,0 +1,2 @@
@box from (0,0,0) to (1,0.5,1)
@box from (0,0.5,0) to (0.5,1,0.5) delete (bottom)

View file

@ -0,0 +1,2 @@
@box from (0,0,0) to (1,0.5,1)
@box from (0.5,0.5,0) to (1,1,0.5) delete (bottom)

View file

@ -193,45 +193,36 @@ static void perform_rect(const xmlelement& root, ModelBuilder& builder) {
std::string texture = root.attr("texture", "$0").getText();
glm::vec3 normal;
glm::vec3 backNormal;
if (root.has("normal")) {
normal = root.attr("normal").asVec3();
backNormal = normal;
} else {
normal = glm::cross(glm::normalize(right), glm::normalize(up));
backNormal = -normal;
}
glm::vec3 center = from + right * 0.5f + up * 0.5f;
UVRegion backRegion = region;
std::swap(backRegion.u1, backRegion.u2);
auto cullFace = root.attr("cull-face", "back").getText();
if (cullFace == "front") {
normal *= -1.0f;
} else if (cullFace == "off") {
if (cullFace != "front") {
builder.addRect(
texture,
shading,
from + right * 0.5f + up * 0.5f,
right * 0.5f,
up * 0.5f,
normal,
region
texture, shading, center, right * 0.5f, up * 0.5f, normal, region
);
}
if (cullFace == "front" || cullFace == "off") {
builder.addRect(
texture,
shading,
center,
right * -0.5f,
up * 0.5f,
backNormal,
backRegion
);
builder.addRect(
texture,
shading,
from + right * 0.5f + up * 0.5f,
right * -0.5f,
up * -0.5f,
-normal,
region
);
return;
}
builder.addRect(
texture,
shading,
from + right * 0.5f + up * 0.5f,
right * 0.5f,
up * 0.5f,
normal,
region
);
}
static void perform_triangle(const xmlelement& root, ModelBuilder& builder) {
@ -249,12 +240,15 @@ static void perform_triangle(const xmlelement& root, ModelBuilder& builder) {
glm::vec3 ba = pointB - pointA;
glm::vec3 ca = pointC - pointA;
glm::vec3 normal;
glm::vec3 backNormal;
if (root.has("normal")) {
normal = root.attr("normal").asVec3();
backNormal = normal;
} else {
normal = glm::normalize(glm::cross(ba, ca));
backNormal = -normal;
}
if (root.has("uv")) {
root.attr("uv").asNumbers(glm::value_ptr(uvs[0]), 6);
} else {
@ -276,10 +270,10 @@ static void perform_triangle(const xmlelement& root, ModelBuilder& builder) {
if (cullFace == "front") {
std::swap(pointB, pointC);
std::swap(uvs[1], uvs[2]);
normal *= -1.0f;
normal = backNormal;
} else if (cullFace == "off") {
builder.addTriangle(texture, shading, pointA, pointB, pointC, normal, uvs[0], uvs[1], uvs[2]);
builder.addTriangle(texture, shading, pointA, pointC, pointB, -normal, uvs[0], uvs[2], uvs[1]);
builder.addTriangle(texture, shading, pointA, pointC, pointB, backNormal, uvs[0], uvs[2], uvs[1]);
return;
}
builder.addTriangle(texture, shading, pointA, pointB, pointC, normal, uvs[0], uvs[1], uvs[2]);

View file

@ -288,7 +288,7 @@ void ContentLoader::loadContent(const dv::value& root) {
ContentUnitLoader<Block>(*pack, builder.blocks, "blocks",
[this](const Block& def) {
if (!def.abstract || !def.hidden) {
if (!def.abstract && !def.hidden) {
bool created;
auto& item = builder.items.create(
def.name + BLOCK_ITEM_SUFFIX, &created

View file

@ -287,7 +287,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
def.tickInterval = 1;
}
if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) {
if ((def.abstract || def.hidden) && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) {
def.pickingItem = CORE_EMPTY;
}
if (root.has("script-name") || def.scriptFile.empty()) {