Merge pull request 'WarpedCrimson_Extras' (#7) from WarpedCrimson_Extras into master

Reviewed-on: MineClone2/MineClone2-Plus#7

Because I said I would.

Also, this is the last contribution I am giving this project / organization.
This commit is contained in:
Michieal 2023-02-17 17:40:32 +00:00
commit bf451c5077
23 changed files with 299 additions and 7 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/mcl_bamboo/
/mcl_amethyst/
/mcl_crimson/
/mcl_crimson_extras/i18n.py

View File

@ -4,9 +4,9 @@
--- DateTime: 01/19/23 4:50 PM
--- Copyright (C) 2023, Michieal. See License.txt
--- Last Update Time: 02/07/23 4:40 AM
--- See License.txt and Additional Terms.txt for licensing.
--- License: See Readme.txt in this module.
--- If you did not receive a copy of the license with this content package, please see:
--- https://www.gnu.org/licenses/gpl-3.0.en.html and https://creativecommons.org/licenses/by-sa/4.0/
--- Readme.txt in this module.
local modname = minetest.get_current_modname()
local S = minetest.get_translator(modname)

View File

@ -2,6 +2,8 @@ Created by Michieal.
Additional Textures: CC-BY 3.0
Code: GPL3
https://www.gnu.org/licenses/gpl-3.0.en.html and https://creativecommons.org/licenses/by-sa/4.0/
One final request -- the Date-Time Creator code block needs to remain in the code files. This allows everyone to know
which version of the code is being used, and allows for better troubleshooting of any errors.
@ -11,5 +13,9 @@ Init.Lua's original Date-Time Creator code block:
--- Created by Michieal.
--- DateTime: 01/19/23 4:50 PM
--- Copyright (C) 2023, Michieal. See License.txt
--- [Last Update Time]
--- Last Update Time: [Last Update Time]
--- License: See Readme.txt in this module.
--- See main License.txt and Additional Terms.txt for licensing.
--- If you did not receive a copy of the license with this content package, please see:
--- Readme.txt in this module.
---

223
mcl_crimson_extras/init.lua Normal file
View File

@ -0,0 +1,223 @@
---
--- Generated by EmmyLua(https://github.com/EmmyLua)
--- Created by Michieal.
--- DateTime: 01/19/23 4:50 PM
--- Copyright (C) 2023, Michieal. See License.txt
--- Last Update Time: 02/15/23 03:15 PM
--- License: See Readme.txt in this module.
--- If you did not receive a copy of the license with this content package, please see:
--- Readme.txt in this module.
--- Warped Textures created/heavily modified by Michieal.
local modname = minetest.get_current_modname()
local S = minetest.get_translator(modname)
local SWAP_BASE_TEXTURES = minetest.settings:get_bool("mcl_crimson_extras_swap_warped", true)
local function allow_texture_swap()
-- Warped Hyphae
local def = "mcl_crimson:warped_hyphae"
local def_tiles = {
"mcl_crimson_extras_warped_hyphae.png",
"mcl_crimson_extras_warped_hyphae.png",
{
image = "mcl_crimson_extras_warped_hyphae_side.png",
animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 2.0 }
},
}
minetest.override_item(def, { tiles = def_tiles })
-- Stripped Warped Hyphae
def = "mcl_crimson:stripped_warped_hyphae"
def_tiles = { "mcl_crimson_extras_warped_stem_stripped_top.png", "mcl_crimson_extras_warped_stem_stripped_top.png", "mcl_crimson_extras_warped_stem_stripped_side.png" }
minetest.override_item(def, { tiles = def_tiles })
-- Stripped Warped Hyphae Bark
def = "mcl_crimson:stripped_warped_hyphae_bark"
def_tiles = { "mcl_crimson_extras_warped_stem_stripped_side.png" }
minetest.override_item(def, { tiles = def_tiles })
-- Warped Hyphae Wood
def = "mcl_crimson:warped_hyphae_wood"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
-- Warped Hyphae Door
def = "mcl_crimson:warped_door"
local def_inventory_image = "mcl_crimson_extras_warped_door.png"
minetest.override_item(def, { inventory_image = def_inventory_image })
def = "mcl_crimson:warped_door_b_2"
def_tiles = {
"blank.png",
"mcl_crimson_extras_door_warped_side_upper.png^[transformFXR90",
"mcl_crimson_extras_door_warped_side_lower.png",
"mcl_crimson_extras_door_warped_side_lower.png^[transformFX",
"mcl_crimson_extras_warped_door_bottom.png",
"mcl_crimson_extras_warped_door_bottom.png^[transformFX",
}
-- tiles = {"blank.png", tt[2].."^[transformFXR90", tb[2], tb[2].."^[transformFX", tb[1], tb[1].."^[transformFX"},
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_crimson:warped_door_t_2"
def_tiles = {
"mcl_crimson_extras_door_warped_side_upper.png^[transformR90",
"blank.png",
"mcl_crimson_extras_door_warped_side_upper.png",
"mcl_crimson_extras_door_warped_side_upper.png^[transformFX",
"mcl_crimson_extras_warped_door_top.png",
"mcl_crimson_extras_warped_door_top.png^[transformFX"
}
-- tiles = {tt[2].."^[transformR90", "blank.png", tt[2], tt[2].."^[transformFX", tt[1], tt[1].."^[transformFX"},
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_crimson:warped_door_b_1"
def_tiles = {
"blank.png",
"mcl_crimson_extras_door_warped_side_upper.png^[transformFXR90",
"mcl_crimson_extras_door_warped_side_lower.png^[transformI",
"mcl_crimson_extras_door_warped_side_lower.png^[transformFX",
"mcl_crimson_extras_warped_door_bottom.png^[transformFX",
"mcl_crimson_extras_warped_door_bottom.png",
}
-- tiles = {"blank.png", tt[2].."^[transformFXR90", tb[2].."^[transformI", tb[2].."^[transformFX", tb[1].."^[transformFX", tb[1]},
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_crimson:warped_door_t_1"
def_tiles = {
"mcl_crimson_extras_door_warped_side_upper.png^[transformR90",
"blank.png",
"mcl_crimson_extras_door_warped_side_upper.png^[transformI",
"mcl_crimson_extras_door_warped_side_upper.png^[transformFX",
"mcl_crimson_extras_warped_door_top.png^[transformFX",
"mcl_crimson_extras_warped_door_top.png"
}
-- tiles = {tt[2].."^[transformR90", "blank.png", tt[2].."^[transformI", tt[2].."^[transformFX", tt[1].."^[transformFX", tt[1]},
minetest.override_item(def, { tiles = def_tiles })
-- Warped Hyphae TrapDoor
def = "mcl_crimson:warped_trapdoor"
local def_wield_image = "mcl_crimson_extras_warped_trapdoor.png"
def_tiles = {
"mcl_crimson_extras_warped_trapdoor.png",
"mcl_crimson_extras_warped_trapdoor.png^[transformFY",
"mcl_crimson_extras_warped_hyphae_wood.png",
"mcl_crimson_extras_warped_hyphae_wood.png",
"mcl_crimson_extras_warped_hyphae_wood.png",
"mcl_crimson_extras_warped_hyphae_wood.png"
}
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { wield_image = def_wield_image })
def = "mcl_crimson:warped_trapdoor_open"
def_tiles = {
"mcl_crimson_extras_warped_hyphae_wood.png",
"mcl_crimson_extras_warped_hyphae_wood.png^[transformR180",
"mcl_crimson_extras_warped_hyphae_wood.png^[transformR270",
"mcl_crimson_extras_warped_hyphae_wood.png^[transformR90",
"mcl_crimson_extras_warped_trapdoor.png^[transform46",
"mcl_crimson_extras_warped_trapdoor.png^[transformFY"
}
minetest.override_item(def, { tiles = def_tiles })
-- Warped Hyphae Bark
def = "mcl_crimson:warped_hyphae_bark"
def_tiles = {
{
image = "mcl_crimson_extras_warped_hyphae_side.png",
animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 2.0 }
},
}
minetest.override_item(def, { tiles = def_tiles })
-- Stairs & Slabs
def = "mcl_stairs:stair_warped_hyphae_wood"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_stairs:stair_warped_hyphae_wood_inner"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_stairs:stair_warped_hyphae_wood_outer"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_stairs:slab_warped_hyphae_wood"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_stairs:slab_warped_hyphae_wood_top"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
def = "mcl_stairs:slab_warped_hyphae_wood_double"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
minetest.override_item(def, { tiles = def_tiles })
-- Buttons
def = "mesecons_button:button_warped_hyphae_wood_off"
def_tiles = {
"mcl_crimson_extras_warped_hyphae_wood.png"
}
def_wield_image = "mesecons_button_wield_mask.png^mcl_crimson_extras_warped_hyphae_wood.png^mesecons_button_wield_mask.png^[makealpha:255,126,126"
def_inventory_image = "mesecons_button_wield_mask.png^mcl_crimson_extras_warped_hyphae_wood.png^mesecons_button_wield_mask.png^[makealpha:255,126,126"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { inventory_image = def_inventory_image })
minetest.override_item(def, { wield_image = def_wield_image })
def = "mesecons_button:button_warped_hyphae_wood_on"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { inventory_image = def_inventory_image })
minetest.override_item(def, { wield_image = def_wield_image })
-- Pressure Plates
def = "mesecons_pressureplates:pressure_plate_warped_hyphae_wood_off"
def_tiles = { "mcl_crimson_extras_warped_hyphae_wood.png" }
def_wield_image = "mcl_crimson_extras_warped_hyphae_wood.png"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { wield_image = def_wield_image })
def = "mesecons_pressureplates:pressure_plate_warped_hyphae_wood_on"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { wield_image = def_wield_image })
-- Warped Hyphae Fence
def = "mcl_crimson:warped_fence"
def_tiles = { "mcl_crimson_extras_warped_fence.png" }
def_wield_image = "mcl_fences_fence_mask.png^mcl_crimson_extras_warped_fence.png^mcl_fences_fence_mask.png^[makealpha:255,126,126"
def_inventory_image = "mcl_fences_fence_mask.png^mcl_crimson_extras_warped_fence.png^mcl_fences_fence_mask.png^[makealpha:255,126,126"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { wield_image = def_wield_image })
minetest.override_item(def, { inventory_image = def_inventory_image })
-- Warped Hyphae Fence Gate
def = "mcl_crimson:warped_fence_gate"
def_tiles = { "mcl_crimson_extras_warped_fence.png" }
def_inventory_image = "mcl_fences_fence_gate_mask.png^mcl_crimson_extras_warped_fence.png^mcl_fences_fence_gate_mask.png^[makealpha:255,126,126"
def_wield_image = "mcl_fences_fence_gate_mask.png^mcl_crimson_extras_warped_fence.png^mcl_fences_fence_gate_mask.png^[makealpha:255,126,126"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { wield_image = def_wield_image })
minetest.override_item(def, { inventory_image = def_inventory_image })
def = "mcl_crimson:warped_fence_gate_open"
def_tiles = {
"mcl_crimson_extras_warped_fence.png"
}
minetest.override_item(def, { tiles = def_tiles })
-- Warped Hyphae Sign
def = "mcl_signs:wall_sign_warped_hyphae_wood"
def_tiles = { "(mcl_signs_sign_greyscale.png^[multiply:#489c62)" }
def_inventory_image = "(default_sign_greyscale.png^[multiply:#489c62)"
def_wield_image = "(default_sign_greyscale.png^[multiply:#489c62)"
minetest.override_item(def, { tiles = def_tiles })
minetest.override_item(def, { wield_image = def_wield_image })
minetest.override_item(def, { inventory_image = def_inventory_image })
-- TODO: Do Standing Signs.
-- minetest.log("Stripped Warped Hyphae:\n" .. dump(minetest.registered_nodes["mcl_crimson:stripped_warped_hyphae"]))
end
if SWAP_BASE_TEXTURES ~= nil and SWAP_BASE_TEXTURES == true then
allow_texture_swap()
end

View File

@ -0,0 +1,8 @@
# textdomain: mcl_crimson_extras
### init.lua ###
Double Warped Slab=
Warped Slab=
Warped Stair=

View File

@ -0,0 +1,5 @@
title = mcl_crimson_extras
name = mcl_crimson_extras
description = Adds in Non-Minecraft Crimson/warped Items; Additionally, makes the warped items textures green.
author = Michieal
depends = mcl_crimson

View File

@ -0,0 +1,33 @@
Created by Michieal.
Some textures in this pack are from Mineclone 2's mcl_crimson module. In most cases, they have been heavily modified by
myself, mostly in coloration. This is intentional, as part of what this mod does is change the purple "warped forest"
blocks / items to their green variants. See below for source images creators.
Textures: CC-BY-SA 4.0 (international)
Code: The code licence is GPL3.
https://www.gnu.org/licenses/gpl-3.0.en.html and https://creativecommons.org/licenses/by-sa/4.0/
One final request -- the Date-Time Creator code block needs to remain in the code files. This allows everyone to know
which version of the code is being used, and allows for better troubleshooting of any errors.
Init.Lua's original Date-Time Creator code block:
---
--- Generated by EmmyLua(https://github.com/EmmyLua)
--- Created by Michieal.
--- DateTime: 01/19/23 4:50 PM
--- Copyright (C) 2023, Michieal. See License.txt
--- Last Update Time: [Last Update Time]
--- License: See Readme.txt in this module.
--- See main License.txt and Additional Terms.txt for licensing.
--- If you did not receive a copy of the license with this content package, please see:
--- Readme.txt in this module.
---
Source Images Creators:
Mcl_crimson_extras_door_warped_side (upper & lower): JoMW1998.
Mcl_crimson_extras_warped_hyphae_side: Michieal (the original was created by Micheal and included in mcl2).
All other textures:
Originals: See Mineclone 2's CREDITS.md, section Textures for credits.
Derivatives: Michieal.

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

View File

@ -4,10 +4,9 @@
--- DateTime: 02/07/2023 6:20 AM
--- Copyright (C) 2023, Michieal. See License.txt
--- Last Update Time: 02/07/23 6:55 PM
--- See License.txt and Additional Terms.txt for licensing.
--- License: See Readme.txt in this module.
--- If you did not receive a copy of the license with this content package, please see:
--- https://www.gnu.org/licenses/gpl-3.0.en.html and https://creativecommons.org/licenses/by-sa/4.0/
---
--- Readme.txt in this module.
local modname = minetest.get_current_modname()
local modpath = minetest.get_modpath(modname)

View File

@ -0,0 +1,17 @@
Created by Michieal.
Additional Textures: CC-BY 3.0
Code: GPL3
https://www.gnu.org/licenses/gpl-3.0.en.html and https://creativecommons.org/licenses/by-sa/4.0/
One final request -- the Date-Time Creator code block needs to remain in the code files. This allows everyone to know
which version of the code is being used, and allows for better troubleshooting of any errors.
Init.Lua's original Date-Time Creator code block:
---
--- Generated by EmmyLua(https://github.com/EmmyLua)
--- Created by Michieal.
--- DateTime: 02/07/2023 6:20 AM
--- Copyright (C) 2023, Michieal. See License.txt
--- Last Update Time: [Last Update Time]
---