Revert "remove 'translucent' block property (will be reverted later)"
This reverts commit 7aacadc926432da2583b95f6a02af08ee51c2c91.
This commit is contained in:
parent
7a3a4476ea
commit
5793c52ac6
@ -6,5 +6,6 @@
|
|||||||
"sky-light-passing": false,
|
"sky-light-passing": false,
|
||||||
"obstacle": false,
|
"obstacle": false,
|
||||||
"selectable": false,
|
"selectable": false,
|
||||||
"replaceable": true
|
"replaceable": true,
|
||||||
|
"translucent": true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -333,6 +333,7 @@ void ContentLoader::loadBlock(
|
|||||||
root.at("inventory-size").get(def.inventorySize);
|
root.at("inventory-size").get(def.inventorySize);
|
||||||
root.at("tick-interval").get(def.tickInterval);
|
root.at("tick-interval").get(def.tickInterval);
|
||||||
root.at("overlay-texture").get(def.overlayTexture);
|
root.at("overlay-texture").get(def.overlayTexture);
|
||||||
|
root.at("translucent").get(def.translucent);
|
||||||
|
|
||||||
if (root.has("fields")) {
|
if (root.has("fields")) {
|
||||||
def.dataStruct = std::make_unique<StructLayout>();
|
def.dataStruct = std::make_unique<StructLayout>();
|
||||||
|
|||||||
@ -140,6 +140,7 @@ void Block::cloneTo(Block& dst) {
|
|||||||
dst.inventorySize = inventorySize;
|
dst.inventorySize = inventorySize;
|
||||||
dst.tickInterval = tickInterval;
|
dst.tickInterval = tickInterval;
|
||||||
dst.overlayTexture = overlayTexture;
|
dst.overlayTexture = overlayTexture;
|
||||||
|
dst.translucent = translucent;
|
||||||
if (particles) {
|
if (particles) {
|
||||||
dst.particles = std::make_unique<ParticlesPreset>(*particles);
|
dst.particles = std::make_unique<ParticlesPreset>(*particles);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -172,6 +172,9 @@ public:
|
|||||||
/// @brief Turns off block item generation
|
/// @brief Turns off block item generation
|
||||||
bool hidden = false;
|
bool hidden = false;
|
||||||
|
|
||||||
|
/// @brief Block has semi-transparent texture
|
||||||
|
bool translucent = false;
|
||||||
|
|
||||||
/// @brief Set of block physical hitboxes
|
/// @brief Set of block physical hitboxes
|
||||||
std::vector<AABB> hitboxes;
|
std::vector<AABB> hitboxes;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user