Emojigit
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'remove-alpha-field'

This commit is contained in:
AFCMS 2021-04-02 14:43:08 +02:00
parent 59d687c579 e20e0fab71
commit 0db47dbf02
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/ITEMS/mcl_core/nodes_liquid.lua
View File

@ -7,10 +7,10 @@ local WATER_ALPHA = 179
local WATER_VISC = 1 local WATER_VISC = 1
local LAVA_VISC = 7 local LAVA_VISC = 7
local LIGHT_LAVA = minetest.LIGHT_MAX local LIGHT_LAVA = minetest.LIGHT_MAX
local USE_TEXTURE_ALPHA local USE_TEXTURE_ALPHA = true
if minetest.features.use_texture_alpha_string_modes then if minetest.features.use_texture_alpha_string_modes then
USE_TEXTURE_ALPHA = "blend" USE_TEXTURE_ALPHA = "blend"
WATER_ALPHA = nil
end end
local lava_death_messages = { local lava_death_messages = {
@ -40,7 +40,6 @@ minetest.register_node("mcl_core:water_flowing", {
}, },
sounds = mcl_sounds.node_sound_water_defaults(), sounds = mcl_sounds.node_sound_water_defaults(),
is_ground_content = false, is_ground_content = false,
alpha = WATER_ALPHA,
use_texture_alpha = USE_TEXTURE_ALPHA, use_texture_alpha = USE_TEXTURE_ALPHA,
paramtype = "light", paramtype = "light",
paramtype2 = "flowingliquid", paramtype2 = "flowingliquid",
@ -86,7 +85,6 @@ S("• When water is directly below lava, the water turns into stone."),
}, },
sounds = mcl_sounds.node_sound_water_defaults(), sounds = mcl_sounds.node_sound_water_defaults(),
is_ground_content = false, is_ground_content = false,
alpha = WATER_ALPHA,
use_texture_alpha = USE_TEXTURE_ALPHA, use_texture_alpha = USE_TEXTURE_ALPHA,
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,

6
mods/ITEMS/mcl_portals/portal_end.lua
View File

@ -4,11 +4,6 @@ local S = minetest.get_translator("mcl_portals")
local SPAWN_MIN = mcl_vars.mg_end_min+70 local SPAWN_MIN = mcl_vars.mg_end_min+70
local SPAWN_MAX = mcl_vars.mg_end_min+98 local SPAWN_MAX = mcl_vars.mg_end_min+98
local PORTAL_ALPHA = 192
if minetest.features.use_texture_alpha_string_modes then
PORTAL_ALPHA = nil
end
local mg_name = minetest.get_mapgen_setting("mg_name") local mg_name = minetest.get_mapgen_setting("mg_name")
local destroy_portal = function(pos) local destroy_portal = function(pos)
@ -81,7 +76,6 @@ minetest.register_node("mcl_portals:portal_end", {
-- This is 15 in MC. -- This is 15 in MC.
light_source = 14, light_source = 14,
post_effect_color = {a = 192, r = 0, g = 0, b = 0}, post_effect_color = {a = 192, r = 0, g = 0, b = 0},
alpha = PORTAL_ALPHA,
after_destruct = destroy_portal, after_destruct = destroy_portal,
-- This prevents “falling through” -- This prevents “falling through”
collision_box = { collision_box = {

2
mods/ITEMS/mcl_portals/portal_nether.lua
View File

@ -30,7 +30,6 @@ local N_Y_MIN, N_Y_MAX = mcl_vars.mg_bedrock_nether_bottom_min, mcl_vars.mg_be
local O_DY, N_DY = O_Y_MAX - O_Y_MIN + 1, N_Y_MAX - N_Y_MIN + 1 local O_DY, N_DY = O_Y_MAX - O_Y_MIN + 1, N_Y_MAX - N_Y_MIN + 1
-- Alpha and particles -- Alpha and particles
local ALPHA = minetest.features.use_texture_alpha_string_modes and 192
local node_particles_allowed = minetest.settings:get("mcl_node_particles") or "none" local node_particles_allowed = minetest.settings:get("mcl_node_particles") or "none"
local node_particles_levels = { none=0, low=1, medium=2, high=3 } local node_particles_levels = { none=0, low=1, medium=2, high=3 }
local PARTICLES = node_particles_levels[node_particles_allowed] local PARTICLES = node_particles_levels[node_particles_allowed]
@ -263,7 +262,6 @@ minetest.register_node(PORTAL, {
drop = "", drop = "",
light_source = 11, light_source = 11,
post_effect_color = {a = 180, r = 51, g = 7, b = 89}, post_effect_color = {a = 180, r = 51, g = 7, b = 89},
alpha = ALPHA,
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {