1 Commits

Author SHA1 Message Date
wsor4035
c643ec34dc add mroe materials 2024-12-01 14:20:11 -05:00
22 changed files with 233 additions and 284 deletions

View File

@@ -1,13 +1,9 @@
globals = {
"minetest",
"core",
"xcompat",
}
read_globals = {
string = {fields = {"split"}},
table = {fields = {"copy", "getn"}},
"default",
"mcl_sounds",
"ks_sounds",
@@ -22,5 +18,4 @@ read_globals = {
"player_api",
"mcl_player",
"fl_player",
"stairs",
}

View File

@@ -1,5 +1,5 @@
MIT Copyright 2021-2025 wsor4035, mt-mods and contributors
MIT Copyright 2021-2024 wsor4035
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in

View File

@@ -15,16 +15,16 @@ See the respective sub apis doc file in /doc for detailed documentation.
## Directly supported games and mods
| Games | Sounds | Materials | Textures | Player | Stairs |
| ----------------- | --------- | --------- | --------- | ------ | ------ |
| Minetest Game | x | x | x | x | x |
| MineClone2 | x | x | | x | |
| Mineclonia | x | x | | x | |
| Hades Revisited | x | x | | | |
| Farlands Reloaded | x | x | x | x | x |
| Exile | x | | | | |
| KSurvive 2 | x | | | | |
| Forgotten Lands | x | | | | |
| Games | Sounds | Materials | Textures | Player |
| ----------------- | --------- | --------- | --------- | ------ |
| Minetest Game | x | x | x | x |
| MineClone2 | x | x | | x |
| Mineclonia | x | x | | x |
| Hades Revisited | x | x | | |
| Farlands Reloaded | x | x | x | x |
| Exile | x | | | |
| KSurvive 2 | x | | | |
| Forgotten Lands | x | | | |
For functions see /doc/functions.md for the specifics relating to the function

View File

@@ -1,16 +1,13 @@
# Functions API
## `can_interact_with_node(player, pos)`
returns `bool`
checks for the ability to interact with a node via:
* if a player
* owner metadata key
* `protection_bypass`
* protection_bypass
supports
* minetest game default if present
* else polyfill
* else polyfill

View File

@@ -6,7 +6,7 @@ simply returns `minetest.get_game_info().id`
## minetest versions < 5.7
approximates the gameid value via a hardcoded table of gameid =\> modname,
approximates the gameid value via a hardcoded table of gameid=>modname
and then checks via `minetest.get_modpath()`. If it fails, it falls
back to using `xcompat_unknown_gameid` as the id. See the chart in the
readme for which games are supported
readme for which games are supported

View File

@@ -1,26 +1,3 @@
# Materials API
## Usage
The materials can be accessed anywhere in your mod with `xcompat.materials.material_name`.
Behind the scenes, xcompat automatically changes the `xcompat.materials`
variable to contain the correct materials for whichever game the mod is
launched in.
## Game support
See the [the support table in the readme](https://github.com/mt-mods/xcompat/tree/master?tab=readme-ov-file#directly-supported-games-and-mods)
for an overview of supported games, and see the contents of `/src/materials/`
for the supported materials and their names.
## Examples
Writing `xcompat.materials.steel_ingot` returns the string of whichever item
would closest represent the `steel_ingot` material in the current game.
The `/src/materials/mineclonia.lua` file shows what the keys of
`xcompat.materials` resolve to when playing Mineclonia, such as
`xcompat.materials.steel_ingot` resolving to `mcl_core:iron_ingot`, and
`xcompat.materials.mesa_crystal` resolving to `mcl_redstone:redstone` if
supported.
consult `/src/materials/minetest.lua` at this time

View File

@@ -1,21 +1,13 @@
# Player API
## Usage
mimic mtg player_api
The player api can be accessed in your script through `xcompat.player`.
## NOTE
This object mimics the `player_api` from Minetest Game, and should be a drop-in
replacement in most cases. You should be able to simply replace instances
of `player_api` in your script with `xcompat.player`.
`xcompat.player.player_attached`
## Note on `xcompat.player.player_attached`
Reading & writing to this object works, but because it's a proxy table it can't
be looped over.
Looping over this object would require lua5.2 `__pairs`/`__ipairs` metamethod support.
It would be possible to implement support for this through polyfill,
using [this method](https://stackoverflow.com/a/77354254)
(luajit supports this via 5.2 extensions), but it's not implemented as of now.
Additionally see [this engine issue](https://github.com/minetest/minetest/issues/15133).
read/write from it is fine, looping over it is not as it is a proxy table. this
would need lua5.2 __pairs/__ipairs metamethods support which i could polyfill
for using https://stackoverflow.com/a/77354254 but didnt feel like doing at
this time. (luajit supports this via 5.2 extensions). additionally see issue:
https://github.com/minetest/minetest/issues/15133

View File

@@ -1,6 +1,5 @@
# Sound API
## Option 1: Agnostically depend
You can do this by using a custom field in your node def instead of the `sounds` key.
@@ -23,7 +22,7 @@ where:
## Option 2: Hard depend
add this mod to your mod.confs depends and directly call the `sound_api` as follows
add this mod to your mod.confs depends and directly call the sound_api as follows
```lua
minetest.register_node(nodename, {
@@ -33,13 +32,4 @@ minetest.register_node(nodename, {
})
```
* input: optional table to override some or all of returned values
## Note
In some instances, when sounds are defined by strings and the sound doesn't
belong to a block or anything mod-specific, xcompat may not be needed. E.g.
the sound `"default_dig_choppy"` is accessed in the same way in both Mineclonia
and Minetest Game, without xcompat.
* input: optional table to override some or all of returned values

View File

@@ -1,30 +0,0 @@
you can use this via `xcompat.stairs.register(nodename, def)`
an example would be:
```lua
xcompat.stairs.register(
"xcompat_stairs_test:fake_node",
core.registered_nodes["xcompat_stairs_test:fake_node"]
)
```
if the game you are running on isnt supported (see readme),
it falls back to using a polyfill. each backend adds aliases
to the polyfill, mainly so that if we add a future backend
that ran on polyfill, everything keeps working (yay)
at this time stairsplus/moreblocks compatibility/upgrading
isnt supported, however should be added in the future. for
now, in your mod code do something like the following:
```lua
if core.registered_modes("moreblocks") then
--call stairs plus
else
xcompat.stairs.register(node, def)
end
```
that way in the future nothing will break when support is
added and at your convince the first part of the if can be
removed

View File

@@ -1,20 +1,3 @@
# Textures API
## Usage
To use a texture in your mod, find the texture you want by looking at one of
the files in `/src/texture`, and append its path to `xcompat.textures`.
If a texture isn't supported for the current game, xcompat creates a solid
color texture using texture modifiers as a fallback, ensuring compatibility.
## Example
| Path | Result in Minetest Game |
| - | - |
| xcompat.textures.wool.white | `"wool_white.png"` |
| xcompat.textures.wood.apple.planks | `"default_wood.png"` |
| xcompat.textures.wood.jungle.leaves | `"default_jungleleaves.png"` |
| xcompat.textures.glass.pane | `"default_glass.png"` |
For games like Minetest and Mineclonia, see the file `/src/textures/minetest.lua`.
consult `/src/texture/minetest.lua` at this time

View File

@@ -12,7 +12,6 @@ xcompat.materials = dofile(modpath .. "/src/materials.lua")
xcompat.textures = dofile(modpath .. "/src/textures.lua")
xcompat.functions = dofile(modpath .. "/src/functions.lua")
xcompat.player = dofile(modpath .. "/src/player.lua")
xcompat.stairs = dofile(modpath .. "/src/stairs.lua")
local function validate_sound(key)
if key and xcompat.sounds[key] then

View File

@@ -1,3 +1,3 @@
name = xcompat
description = Provides cross compatibility between mods and games for sounds and crafting materials.
optional_depends = default, fl_stone, fl_trees, mcl_sounds, hades_sounds, ks_sounds, nodes_nature, fl_topsoil, fl_trees, mcl_core, farming, x_farming, sounds, mtt, player_api, mcl_player, fl_player, stairs
optional_depends = default, fl_stone, fl_trees, mcl_sounds, hades_sounds, ks_sounds, nodes_nature, fl_topsoil, fl_trees, mcl_core, farming, x_farming, sounds, mtt, player_api, mcl_player, fl_player

View File

@@ -78,7 +78,6 @@ local materials = {
jungle_leaves = "fl_trees:jungletree_leaves",
bowl = "",
stick = "fl_trees:stick",
obsidian = "",
}
if minetest.get_modpath("basic_materials") then

View File

@@ -85,7 +85,6 @@ local materials = {
--hades has no bowl but you get plate on eat so makes most sense?
bowl = "hades_food:plate",
stick = "hades_core:stick",
obsidian = "hades_core:obsidian",
}
if minetest.get_modpath("hades_bucket") then

View File

@@ -1,8 +1,5 @@
--note this file handles mineclonia, mineclone2, and its rename voxelibre
local mcl_dyes = minetest.get_modpath("mcl_dyes")
local mcl_dyes_name = mcl_dyes and "mcl_dyes" or "mcl_dye"
local materials = {
sand = "mcl_core:sand",
sandstone = "mcl_core:sandstone",
@@ -12,41 +9,44 @@ local materials = {
steel_ingot = "mcl_core:iron_ingot",
gold_ingot = "mcl_core:gold_ingot",
tin_ingot = "mcl_core:iron_ingot",
copper_block = "mcl_copper:block",
steel_block = "mcl_core:ironblock",
gold_block = "mcl_core:goldblock",
tin_block = "mcl_core:ironblock",
copper_block = "mcl_copper:copper_block",
steel_block = "mcl_core:iron_block",
gold_block = "mcl_core:gold_block",
tin_block = "mcl_core:iron_block",
axe_steel = "mcl_core:axe_steel",
axe_diamond = "mcl_core:axe_diamond",
axe_bronze = "mcl_core:axe_bronze",
axe_stone = "mcl_core:axe_stone",
axe_wood = "mcl_core:axe_wood",
pick_steel = "mcl_core:pick_steel",
mese = "mesecons_torch:redstoneblock",
mese_crystal = "mesecons:redstone",
mese_crystal_fragment = "mcl_core:iron_ingot",
torch = "mcl_torches:torch",
diamond = "mcl_core:diamond",
clay_lump = "mcl_core:clay_lump",
clay_lump = "default:clay_lump",
water_bucket = "mcl_buckets:bucket_water",
empty_bucket = "mcl_buckets:bucket_empty",
dye_dark_grey = mcl_dyes_name .. ":dark_grey",
dye_black = mcl_dyes_name .. ":black",
dye_white = mcl_dyes_name .. ":white",
dye_green = mcl_dyes_name .. ":green",
dye_red = mcl_dyes_name .. ":red",
dye_yellow = mcl_dyes_name .. ":yellow",
dye_brown = mcl_dyes_name .. ":brown",
dye_blue = mcl_dyes_name .. ":blue",
dye_violet = mcl_dyes_name .. ":violet",
dye_grey = mcl_dyes_name .. ":grey",
dye_dark_green = mcl_dyes_name .. ":dark_green",
dye_orange = mcl_dyes_name .. ":orange",
dye_pink = mcl_dyes_name .. ":pink",
dye_cyan = mcl_dyes_name .. ":cyan",
dye_magenta = mcl_dyes_name .. ":magenta",
dye_dark_grey = "mcl_dyes:dark_grey",
dye_black = "mcl_dyes:black",
dye_white = "mcl_dyes:white",
dye_green = "mcl_dyes:green",
dye_red = "mcl_dyes:red",
dye_yellow = "mcl_dyes:yellow",
dye_brown = "mcl_dyes:brown",
dye_blue = "mcl_dyes:blue",
dye_violet = "mcl_dyes:violet",
dye_grey = "mcl_dyes:grey",
dye_dark_green = "mcl_dyes:dark_green",
dye_orange = "mcl_dyes:orange",
dye_pink = "mcl_dyes:pink",
dye_cyan = "mcl_dyes:cyan",
dye_magenta = "mcl_dyes:magenta",
silicon = "mcl_core:iron_ingot",
string = "mcl_mobitems:string",
paper = "mcl_core:paper",
book = "mcl_books:book",
iron_lump = "mcl_raw_ores:raw_iron",
book = "mcl_core:book",
iron_lump = "mcl_core:stone_with_iron",
wool_grey = "mcl_wool:grey",
wool_green = "mcl_wool:green",
wool_dark_green = "mcl_wool:dark_green",
@@ -57,8 +57,8 @@ local materials = {
slab_wood = "mcl_stairs:slab_wood",
glass = "mcl_core:glass",
glass_block = "mcl_core:glass",
glass_bottle = "mcl_potions:glass_bottle",
coal_lump = "mcl_core:coal_lump",
glass_bottle = "mcl_core:glass_bottle",
coal_lump = "mcl_core:coal",
stone = "mcl_core:stone",
desert_stone = "mcl_core:redsandstone",
desert_sand = "mcl_core:sand",
@@ -70,39 +70,17 @@ local materials = {
water_flowing = "mcl_core:water_flowing",
dirt = "mcl_core:dirt",
dirt_with_grass = "mcl_core:dirt_with_grass",
apple_leaves = "mcl_trees:leaves_oak",
apple_log = "mcl_trees:tree_oak",
apple_planks = "mcl_trees:wood_oak",
birch_leaves = "mcl_trees:leaves_birch",
birch_log = "mcl_trees:tree_birch",
birch_planks = "mcl_trees:wood_birch",
jungle_leaves = "mcl_trees:leaves_jungle",
bowl = "mcl_core:bowl",
stick = "mcl_core:stick",
obsidian = "mcl_core:obsidian",
}
if minetest.get_modpath("mcl_redstone") then
materials.mese = "mcl_redstone_torch:redstoneblock"
materials.mese_crystal = "mcl_redstone:redstone"
materials.mese_crystal_fragment = "mcl_core:iron_ingot"
else
materials.mese = "mesecons_torch:redstoneblock"
materials.mese_crystal = "mesecons:redstone"
materials.mese_crystal_fragment = "mcl_core:iron_ingot"
end
if minetest.get_modpath("mcl_trees") then
materials.apple_leaves = "mcl_trees:leaves_oak"
materials.apple_log = "mcl_trees:tree_oak"
materials.apple_planks = "mcl_trees:wood_oak"
materials.birch_leaves = "mcl_trees:leaves_birch"
materials.birch_log = "mcl_trees:tree_birch"
materials.birch_planks = "mcl_trees:wood_birch"
materials.jungle_leaves = "mcl_trees:leaves_jungle"
else
materials.apple_leaves = "mcl_core:leaves"
materials.apple_log = "mcl_core:tree"
materials.apple_planks = "mcl_core:wood"
materials.birch_leaves = "mcl_core:birchleaves"
materials.birch_log = "mcl_core:birchtree"
materials.birch_planks = "mcl_core:birchwood"
materials.jungle_leaves = "mcl_core:jungleleaves"
end
if minetest.get_modpath("moreores") then
materials.tin_ingot = "moreores:tin_ingot"
materials.tin_block = "moreores:tin_block"

View File

@@ -7,6 +7,7 @@ local materials = {
steel_ingot = "default:steel_ingot",
gold_ingot = "default:gold_ingot",
tin_ingot = "default:tin_ingot",
bronze_ingot = "default:bronze_ingot",
copper_block = "default:copperblock",
steel_block = "default:steelblock",
gold_block = "default:goldblock",
@@ -17,13 +18,17 @@ local materials = {
axe_stone = "default:axe_stone",
axe_wood = "default:axe_wood",
pick_steel = "default:pick_steel",
pick_silver = "default:pick_silver",
mese = "default:mese",
mese_crystal = "default:mese_crystal",
mese_crystal_fragment = "default:mese_crystal_fragment",
torch = "default:torch",
diamond = "default:diamond",
clay = "default:clay",
clay_lump = "default:clay_lump",
water_bucket = "bucket:bucket_water",
lava_bucket = "bucket:bucket_lava",
river_water_bucket = "bucket:bucket_river_water",
empty_bucket = "bucket:bucket_empty",
dye_dark_grey = "dye:dark_grey",
dye_black = "dye:black",
@@ -45,6 +50,9 @@ local materials = {
paper = "default:paper",
book = "default:book",
iron_lump = "default:iron_lump",
gold_lump = "default:gold_lump",
copper_lump = "default:copper_lump",
tin_lump = "default:tin_lump",
wool_grey = "wool:grey",
wool_green = "wool:green",
wool_dark_green = "wool:dark_green",
@@ -60,24 +68,41 @@ local materials = {
stone = "default:stone",
desert_stone = "default:desert_stone",
desert_sand = "default:desert_sand",
desert_sandstone = "default:desert_sandstone",
silver_sand = "default:silver_sand",
silver_sandstone = "default:silver_sandstone",
chest = "default:chest",
cobble = "default:cobble",
mossycobble = "default:mossycobble",
brick = "default:brick",
obsidian = "default:obsidian",
obsidian_glass = "default:obsidian_glass",
water_source = "default:water_source",
water_flowing = "default:water_flowing",
river_water_source = "default:river_water_source",
river_water_flowing = "default:river_water_flowing",
lava_source = "default:lava_source",
lava_flowing = "default:lava_flowing",
dirt = "default:dirt",
dirt_with_grass = "default:dirt_with_grass",
dirt_with_snow = "default:dirt_with_snow",
snowblock = "default:snowblock",
ice = "default:ice",
apple_leaves = "default:leaves",
apple_log = "default:tree",
apple_planks = "default:wood",
acacia_planks = "default:acacia_wood",
birch_leaves = "default:aspen_leaves",
birch_log = "default:aspen_tree",
birch_planks = "default:aspen_wood",
jungle_leaves = "default:jungleleaves",
bowl = "",
stick = "default:stick",
obsidian = "default:obsidian",
wheat = "farming:wheat",
wheat_seed = "farming:seed_wheat",
dry_shrub = "default:dry_shrub",
insulation = "mesecons_materials:fiber",
furnace = "default:furnace",
}
if minetest.registered_items["farming:bowl"] then
@@ -88,12 +113,15 @@ end
if minetest.get_modpath("moreores") then
materials.silver_ingot = "moreores:silver_ingot"
materials.mithril_block = "moreores:mithril_block"
materials.mithril_ingot = "moreores:mithril_ingot"
end
if minetest.get_modpath("technic") then
materials.lead_ingot = "technic:lead_ingot"
materials.carbon_steel_ingot = "technic:carbon_steel_ingot"
materials.stainless_steel_ingot = "technic:stainless_steel_ingot"
materials.insulation = "technic:rubber"
end
if minetest.get_modpath("aloz") then

View File

@@ -1,8 +0,0 @@
local filename = xcompat.gameid
--if we dont have a stairs file for the game, use xcompat_agnostic
if not xcompat.utilities.file_exists(xcompat.modpath .. "/src/stairs/" .. filename .. ".lua") then
filename = "xcompat_agnostic"
end
return dofile(xcompat.modpath .. "/src/stairs/" .. filename .. ".lua")

View File

@@ -1,25 +0,0 @@
local function register(name, _)
local splitName = name:split(":")
local sName = splitName[2]
local groups = core.registered_nodes[name].groups
groups.stairable = 1
core.override_item(name, {groups = groups})
local flStairNameOverrides = {
["stair_inner"] = "inner_stair",
["stair_outer"] = "outer_stair"
}
for _, type in pairs({"slab", "stair", "stair_inner", "stair_outer"}) do
minetest.register_alias(
splitName[1] .. ":" .. type .. "_" .. sName,
splitName[1] .. ":" .. sName .. "_" .. (flStairNameOverrides[type] or type)
)
end
end
return {register = register}

View File

@@ -1,19 +0,0 @@
local function register(name, def)
local splitName = name:split(":")
local sName = splitName[2]
stairs.register_stair_and_slab(
sName,
nil,
def.groups,
def.tiles,
def.description,
def.sounds
)
for _, type in pairs({"slab", "stair", "stair_inner", "stair_outer"}) do
minetest.register_alias(splitName[1] .. ":" .. type .. "_" .. sName, "stairs:" .. type .. "_" .. sName)
end
end
return {register = register}

View File

@@ -1,48 +0,0 @@
local stairtable = {
{
"slab",
{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
},
{
"stair",
{
{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5},
},
},
{
"stair_inner",
{
{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5},
{-0.5, 0.0, -0.5, 0.0, 0.5, 0.0},
},
},
{
"stair_outer",
{
{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
{-0.5, 0.0, 0.0, 0.0, 0.5, 0.5},
},
},
}
local function register(name, def)
for _, sdef in pairs(stairtable) do
local split = name:split(":")
local ndef = table.copy(def)
local item_name = ":" .. sdef[1] .. "_" .. split[2]
ndef.description = def.description .. " " .. string.gsub(sdef[1], "_", " ")
ndef.paramtype, ndef.paramtype2 = "light", "facedir"
ndef.drawtype = "nodebox"
ndef.node_box = {
type = "fixed",
fixed = sdef[2],
}
minetest.register_node(":" .. split[1] .. item_name, ndef)
end
end
return {register = register}

View File

@@ -1,4 +1,5 @@
mcl_walls:brick_5
pipeworks:conductor_tube_on_2
mcl_walls:brick_6
pipeworks:storage_tank_6
mesecons:wire_10111010_on
@@ -6,23 +7,29 @@ mesecons:wire_10111010_off
mcl_walls:brick_8
mesecons:wire_01110001_on
mesecons:wire_01110001_off
pipeworks:conductor_tube_on_4
mcl_walls:brick_10
mcl_stairs:slab_jungle_bark
mcl_stairs:slab_jungle_bark_top
mcl_walls:brick_12
mesecons:wire_11111010_on
mesecons:wire_11111010_off
pipeworks:conductor_tube_on_6
mesecons:wire_11110001_on
mesecons:wire_11110001_off
mcl_walls:brick_15
pipeworks:conductor_tube_on_7
mcl_walls:brick_16
pipeworks:expansion_tank_8
mcl_walls:brick_21
pipeworks:conductor_tube_on_8
mesecons:wire_01100110_on
mesecons:wire_01100110_off
pipeworks:conductor_tube_off_9
mesecons:wire_10011001_on
mesecons:wire_10011001_off
mcl_walls:sandstone_1
pipeworks:conductor_tube_off_10
mcl_walls:sandstone_2
mcl_walls:sandstone_3
pipeworks:expansion_tank_9
@@ -218,11 +225,16 @@ mcl_heads:zombie_wall
homedecor:kitchen_cabinet_colored_with_drawers_granite_locked
mcl_heads:creeper_ceiling
mcl_heads:creeper_wall
pipeworks:lua_tube110001
pipeworks:lua_tube001001
homedecor:kitchen_cabinet_colorable_marble_locked
homedecor:kitchen_cabinet_colorable_marble
pipeworks:lua_tube101001
homedecor:banister_wood_diagonal_right_sapphire
homedecor:banister_wood_diagonal_right_blue
pipeworks:lua_tube111001
mcl_heads:steve_wall
pipeworks:lua_tube000101
homedecor:banister_wood_diagonal_right_violet
homedecor:kitchen_cabinet_colored_with_drawers_marble
homedecor:banister_wood_diagonal_right_mulberry
@@ -232,11 +244,18 @@ homedecor:kitchen_cabinet_colorable_with_drawers_marble_locked
homedecor:banister_wood_diagonal_right_rose
mcl_bamboo:bamboo_mosaic
homedecor:banister_wood_diagonal_right_crimson
pipeworks:lua_tube100101
homedecor:banister_white_dark_diagonal_right
pipeworks:lua_tube010101
homedecor:banister_brass_diagonal_right
mcl_bamboo:scaffolding_horizontal
homedecor:banister_wrought_iron_diagonal_right
pipeworks:lua_tube110101
pipeworks:lua_tube001101
pipeworks:lua_tube101101
pipeworks:lua_tube011101
mcl_flowerpots:flower_pot_bamboo
pipeworks:lua_tube000011
mcl_stairs:slab_bamboo
mcl_stairs:slab_bamboo_top
mcl_stairs:slab_bamboo_double
@@ -296,8 +315,11 @@ mcl_core:water_flowing
mclx_core:river_water_source
mclx_core:river_water_flowing
mcl_maps:filled_map_mcl_skins_base_1B47A57FF_male_crea
pipeworks:lua_tube101111
mcl_maps:filled_map_mcl_skins_base_18D471DFF_female_crea
pipeworks:lua_tube011111
mcl_maps:filled_map_mcl_skins_base_18D471DFF_male_crea
pipeworks:lua_tube111111
mcl_maps:filled_map_character_male_crea
mcl_doors:door_bamboo_b_1
mcl_nether:nether_wart_1
@@ -843,6 +865,7 @@ homedecor:curtainrod_wrought_iron
pipeworks:tag_tube_101000
ignore
pipeworks:tag_tube_101001
pipeworks:lua_tube_burnt
pipeworks:tag_tube_101010
homedecor:desk_locked
pipeworks:tag_tube_101011
@@ -1314,6 +1337,7 @@ mcl_stairs:stair_concrete_yellow
mcl_walls:stonebrick_8
homedecor:welcome_mat_grey
mcl_walls:stonebrick_9
pipeworks:lua_tube100000
mcl_walls:stonebrick_10
mcl_stairs:stair_redsandstonesmooth_inner
mcl_walls:stonebrick_11
@@ -1349,6 +1373,7 @@ mcl_stairs:slab_stonebrick_double
mcl_walls:stonebrickmossy_7
mcl_stairs:stair_stone
mcl_walls:stonebrickmossy_8
pipeworks:lua_tube101000
mcl_walls:stonebrickmossy_9
mcl_stairs:slab_end_stone
mcl_walls:stonebrickmossy_10
@@ -1464,12 +1489,17 @@ mcl_doors:iron_door_b_1
mcl_doors:iron_door_t_2
mcl_doors:iron_door_b_2
mcl_stairs:slab_stonebrickcracked_double
pipeworks:lua_tube001110
mesecons:wire_00110001_on
mesecons:wire_00110001_off
mcl_stairs:slab_stonebrickcracked_top
pipeworks:lua_tube101110
mcl_stairs:slab_stonebrickcracked
pipeworks:lua_tube011110
mcl_stairs:stair_stonebrickcracked_inner
pipeworks:lua_tube111110
mcl_stairs:slab_jungle
pipeworks:lua_tube000001
mcl_doors:door_warped_b_2
mesecons:wire_10110001_on
mesecons:wire_10110001_off
@@ -1495,16 +1525,22 @@ mcl_stairs:stair_warped
mcl_stairs:stair_lapisblock
mcl_stairs:stair_warped_outer
mcl_stairs:stair_warped_inner
pipeworks:detector_tube_on_10
mcl_villages:crop_flower_5
mesecons:wire_11000100_on
mesecons:wire_11000100_off
pipeworks:detector_tube_off_4
mcl_villages:crop_flower_3
mcl_stairs:stair_warped_bark
mcl_villages:crop_tree_8
pipeworks:conductor_tube_off_2
mcl_villages:crop_tree_6
mcl_villages:crop_tree_5
pipeworks:conductor_tube_off_6
pipeworks:conductor_tube_off_8
mesecons:wire_01100100_on
mesecons:wire_01100100_off
pipeworks:conductor_tube_on_3
pipeworks:steel_pane_embedded_tube
mcl_crimson:weeping_vines
mcl_villages:crop_bush_7
@@ -1522,20 +1558,27 @@ mcl_villages:crop_bush_1
pipeworks:teleport_tube_9
mcl_deepslate:deepslatetileswall_3
mcl_villages:crop_gourd_6
pipeworks:lua_tube011000
pipeworks:lua_tube100100
mesecons:wire_01010100_on
mesecons:wire_01010100_off
pipeworks:lua_tube001100
pipeworks:deployer_on
mcl_villages:crop_root_8
pipeworks:lua_tube101010
mcl_villages:crop_root_6
pipeworks:dispenser_off
mcl_villages:crop_root_5
pipeworks:lua_tube110110
mcl_villages:crop_root_3
mesecons:wire_11010100_on
mesecons:wire_11010100_off
mcl_villages:crop_root_2
mcl_villages:crop_root_1
pipeworks:lua_tube011011
mcl_villages:crop_grain_7
mcl_villages:crop_grain_6
pipeworks:lua_tube110111
pipeworks:sand_tube_1
mcl_villages:crop_grain_3
mcl_villages:crop_grain_2
@@ -1680,6 +1723,7 @@ homedecor:kitchen_cabinet_colored
mesecons:wire_01110010_on
mesecons:wire_01110010_off
mesecons_pressureplates:pressure_plate_spruce_on
pipeworks:lua_tube111000
mesecons_button:button_spruce_off
mcl_fences:oak_fence
homedecor:dishwasher_wood
@@ -1997,6 +2041,10 @@ homedecor:cardboard_box_big
homedecor:fishtank_lighted
homedecor:fishtank
homedecor:bathroom_set
pipeworks:detector_tube_off_3
pipeworks:detector_tube_off_2
pipeworks:detector_tube_off_1
pipeworks:detector_tube_on_7
mcl_trees:tree_acacia
homedecor:rug_small
homedecor:ceiling_tile
@@ -2416,29 +2464,63 @@ mesecons:wire_10101000_on
mesecons:wire_10101000_off
pipeworks:sand_tube_3
mcl_villages:crop_grain_4
pipeworks:lua_tube001111
mcl_sus_nodes:gravel
mcl_villages:crop_grain_5
pipeworks:lua_tube010111
pipeworks:lua_tube100111
mcl_sus_nodes:gravel_1
pipeworks:lua_tube000111
mesecons:wire_11101000_on
mcl_sus_nodes:gravel_2
pipeworks:lua_tube111011
mcl_panes:pane_grey
mcl_villages:crop_grain_8
pipeworks:lua_tube101011
pipeworks:lua_tube001011
pipeworks:lua_tube110011
pipeworks:lua_tube010011
pipeworks:lua_tube100011
pipeworks:lua_tube111101
mesecons:wire_10011000_on
mcl_nether:ancient_debris
pipeworks:lua_tube011001
pipeworks:lua_tube010001
pipeworks:lua_tube100001
mcl_villages:crop_root_4
pipeworks:lua_tube010110
pipeworks:lua_tube100110
mcl_flowerpots:flower_pot_cactus
pipeworks:lua_tube000110
pipeworks:lua_tube111010
mesecons:wire_11011000_on
mesecons:wire_11011000_off
pipeworks:lua_tube011010
mcl_villages:crop_root_7
pipeworks:lua_tube001010
pipeworks:lua_tube110010
mcl_core:glass
mcl_panes:pane_cyan
pipeworks:lua_tube010010
pipeworks:lua_tube100010
pipeworks:lua_tube000010
mesecons:wire_10111000_on
mesecons:wire_10111000_off
pipeworks:lua_tube111100
pipeworks:lua_tube011100
pipeworks:lua_tube101100
mcl_villages:crop_gourd_3
pipeworks:lua_tube110100
pipeworks:lua_tube010100
mcl_villages:crop_gourd_4
pipeworks:lua_tube000100
homedecor:kitchen_cabinet_colorable
mcl_villages:crop_gourd_5
pipeworks:lua_tube001000
pipeworks:lua_tube110000
mcl_core:glass_grey
pipeworks:lua_tube010000
pipeworks:lua_tube000000
mcl_villages:crop_gourd_7
pipeworks:teleport_tube_10
mcl_core:glass_yellow
@@ -2473,31 +2555,47 @@ mcl_villages:crop_bush_8
pipeworks:tag_tube_011101
pipeworks:tag_tube_001010
mcl_villages:crop_tree_1
pipeworks:conductor_tube_on_compatibility
pipeworks:conductor_tube_on_10
pipeworks:conductor_tube_on_9
pipeworks:conductor_tube_on_5
mesecons_torch:redstoneblock
mcl_villages:crop_tree_2
pipeworks:conductor_tube_on_1
pipeworks:conductor_tube_off_compatibility
mcl_villages:crop_tree_3
pipeworks:conductor_tube_off_7
signs_road:green_left_sign
mcl_villages:crop_tree_4
signs_road:green_right_sign
pipeworks:conductor_tube_off_5
mesecons_pistons:piston_sticky_on
mesecons_pistons:piston_pusher_sticky
pipeworks:conductor_tube_off_4
signs_road:yellow_left_sign
pipeworks:conductor_tube_off_3
signs_road:yellow_right_sign
mcl_villages:crop_tree_7
mcl_deepslate:deepslatebrickswall_0
pipeworks:detector_tube_off_compatibility
mesecons_pistons:piston_up_normal_on
mesecons_pistons:piston_up_pusher_normal
mcl_copper:block
signs_road:red_right_sign
pipeworks:detector_tube_off_9
pipeworks:detector_tube_off_8
pipeworks:detector_tube_off_7
mesecons_pistons:piston_up_sticky_on
mesecons_pistons:piston_up_pusher_sticky
mcl_walls:sandstone_4
pipeworks:detector_tube_off_5
pipeworks:mese_tube_101011
mcl_villages:crop_flower_4
homedecor:flower_pot_terracotta
homedecor:flower_pot_green
homedecor:flower_pot_black
pipeworks:mese_tube_101100
pipeworks:detector_tube_on_compatibility
mcl_villages:crop_flower_6
mcl_doors:trapdoor_jungle_open
signs_road:large_street_sign
@@ -2622,6 +2720,7 @@ mcl_deepslate:deepslatebrickswall_8
mcl_deepslate:deepslatebrickswall_3
mcl_deepslate:deepslatebrickswall_2
mcl_deepslate:deepslatebrickswall_1
pipeworks:conductor_tube_off_1
mcl_stairs:stair_deepslate_bricks_inner
mcl_stairs:stair_deepslate_bricks_outer
mcl_stairs:stair_deepslate_bricks
@@ -2650,23 +2749,31 @@ mcl_stairs:stair_deepslate_polished
mcl_deepslate:deepslate_polished
mcl_deepslate:deepslatecobbledwall
mcl_deepslate:deepslatecobbledwall_15
pipeworks:detector_tube_on_1
mcl_deepslate:deepslatecobbledwall_2
mcl_stairs:slab_jungle_top
pipeworks:detector_tube_on_2
homedecor:hanging_lantern_4
mesecons:wire_10110010_off
pipeworks:detector_tube_on_3
homedecor:ceiling_lantern_4
mcl_farming:wheat_1
pipeworks:detector_tube_on_4
homedecor:lattice_lantern_large_4
mcl_monster_eggs:monster_egg_stone
pipeworks:detector_tube_on_5
homedecor:lattice_lantern_small_4
mcl_doors:door_bamboo_t_1
pipeworks:detector_tube_on_6
homedecor:desk_lamp_4
mcl_trees:leaves_dark_oak
mcl_trees:leaves_dark_oak_orphan
homedecor:ceiling_lamp_4
mcl_stairs:stair_jungle
pipeworks:detector_tube_on_8
mcl_trees:sapling_jungle
homedecor:table_lamp_4
pipeworks:detector_tube_on_9
homedecor:book_red
mcl_fences:dark_oak_fence
mcl_sus_nodes:gravel_3
@@ -2813,10 +2920,12 @@ mcl_walls:mudbrick_6
mcl_observers:observer_off
signs_road:red_left_sign
mcl_lush_caves:azalea_leaves
mcl_lush_caves:azalea_leaves_orphan
mesecons_button:button_oak_on
mcl_signs:wall_sign_warped
mcl_walls:endbricks_8
mcl_lush_caves:azalea_leaves_flowering
mcl_lush_caves:azalea_leaves_flowering_orphan
mcl_stairs:slab_redsandstone_double
mcl_stairs:slab_redsandstone
mcl_trees:tree_oak
@@ -3321,6 +3430,7 @@ mcl_colorblocks:concrete_white
mcl_walls:granite_0
mcl_lanterns:soul_lantern_floor
mcl_walls:granite_1
pipeworks:detector_tube_off_6
mcl_walls:granite_2
mcl_core:mossycobble
mcl_walls:granite_3
@@ -3332,6 +3442,7 @@ mcl_stairs:slab_sandstonesmooth
mcl_walls:granite_6
mcl_stairs:slab_sandstonesmooth_double
mcl_walls:granite_7
pipeworks:detector_tube_off_10
mcl_walls:granite_8
mcl_fences:jungle_fence_gate_open
mcl_walls:granite_9

View File

@@ -1,9 +1,11 @@
mcl_maps:filled_map_character_male_crea
mcl_potions:food_poisoning_arrow_box
mcl_doors:spruce_trapdoor_ladder
mcl_colorblocks:hardened_clay_white
mcl_ocean:dead_tube_coral_block
mcl_chests:green_shulker_box
mcl_beehives:bee_nest
mcl_potions:harming_arrow_box
mcl_cauldrons:cauldron_3
mcl_stairs:stair_copper_cut
mcl_doors:birch_trapdoor_ladder
@@ -41,6 +43,7 @@ mcl_colorblocks:glazed_terracotta_pillar_silver
mcl_core:ironblock
mcl_end:dragon_egg
mcl_stairs:stair_redsandstonesmooth2_outer
mcl_potions:saturation_arrow_box
mcl_brewing:stand_011
mcl_walls:mudbrick_7
mcl_stairs:stair_waxed_copper_oxidized_cut_inner
@@ -146,6 +149,7 @@ mcl_stairs:stair_sandstonesmooth2_inner
mcl_walls:andesite_2
mcl_core:stone_with_iron
mcl_mushrooms:brown_mushroom_block_cap_011110
mcl_potions:strength_arrow_box
mcl_farming:melontige_7
mcl_colorblocks:glazed_terracotta_pink
mesecons_torch:redstoneblock
@@ -176,6 +180,7 @@ mcl_stairs:slab_andesite_double
mcl_flowers:rose_bush_top
mcl_flowers:allium
mcl_ocean:brain_coral
mcl_potions:leaping_arrow_box
xpanes:pane_yellow_flat
mcl_cherry_blossom:cherrytree
mcl_stairs:stair_concrete_magenta_inner
@@ -210,6 +215,7 @@ mcl_chests:red_shulker_box_small
mcl_farming:sweet_berry_bush_1
mcl_composters:composter_2
mcl_beehives:bee_nest_2
mcl_potions:frost_arrow_box
mcl_walls:redsandstone_11
mcl_walls:mossycobble_7
mesecons_lightstone:lightstone_on_blue
@@ -218,6 +224,7 @@ mcl_cherry_blossom:stripped_cherrytree_bark
mcl_crimson:warped_hyphae_wood
vl_hollow_logs:stripped_crimson_hyphae_hollow
mcl_cauldrons:cauldron
mcl_potions:resistance_arrow_box
mcl_stairs:stair_mangrove_wood_outer
mcl_copper:block_weathered_cut
mcl_walls:stonebrickmossy_12
@@ -331,6 +338,7 @@ mcl_walls:stonebrickmossy_13
mcl_stairs:slab_mossycobble_double
mcl_doors:jungle_trapdoor_open
mcl_flowerpots:flower_pot_dandelion
mcl_potions:invisibility_arrow_box
mcl_flowers:sunflower
mcl_cherry_blossom:cherryleaves_orphan
mcl_farming:pumpkin_face_light
@@ -437,6 +445,7 @@ mcl_nether:ancient_debris
mcl_walls:mudbrick_1
mcl_colorblocks:concrete_red
mcl_stairs:stair_blackstone_chiseled_polished_inner
mcl_potions:water_breathing_arrow_box
mesecons_delayer:delayer_on_locked
mcl_brewing:stand_101
mcl_walls:granite_1
@@ -673,6 +682,7 @@ mesecons_pressureplates:pressure_plate_mangrove_wood_on
mcl_mushrooms:red_mushroom_block_cap_111010
mcl_stairs:stair_copper_oxidized_cut_outer
mcl_farming:melontige_linked_b
mcl_potions:swiftness_arrow_box
mcl_ocean:horn_coral_fan
mcl_crimson:crimson_hyphae_wood
mcl_core:dirt_with_grass
@@ -689,6 +699,7 @@ mcl_wool:light_blue_carpet
mcl_ocean:brain_coral_block
mcl_colorblocks:hardened_clay_orange
mcl_flowerpots:flower_pot_tulip_red
mcl_potions:nausea_arrow_box
mcl_signs:wall_sign
mcl_stairs:stair_waxed_copper_oxidized_cut_outer
mcl_crimson:warped_trapdoor_open
@@ -792,6 +803,7 @@ mcl_signs:wall_sign_darkwood
mcl_crimson:warped_door_b_4
mcl_bamboo:bamboo_door_t_3
mcl_flowers:peony
mcl_potions:weakness_arrow_box
mcl_stairs:stair_prismarine
mcl_nether:nether_wart_1
mcl_portals:portal_end
@@ -851,6 +863,7 @@ mcl_stairs:slab_waxed_copper_exposed_cut
mcl_stairs:slab_waxed_copper_exposed_cut_double
mcl_crimson:warped_nylium
mesecons_lightstone:lightstone_off_blue
mcl_potions:slowness_arrow_box
mcl_stairs:stair_concrete_grey_outer
mcl_core:sprucetree_bark
mcl_stairs:slab_crimson_hyphae_wood
@@ -924,6 +937,7 @@ mcl_signs:standing_sign_crimson_hyphae_wood
mcl_doors:wooden_door_t_2
mcl_walls:sandstone_12
mcl_stairs:slab_birchtree_bark_top
mcl_potions:health_boost_arrow_box
mcl_walls:granite_5
mcl_mangrove:mangrove_mud_roots
mcl_stairs:slab_blackstone_polished_double
@@ -947,6 +961,7 @@ mcl_chests:lightblue_shulker_box_small
mcl_signs:standing_sign_darkwood
mcl_smoker:smoker
mcl_stairs:stair_blackstone_brick_polished_outer
mcl_potions:blindness_arrow_box
mesecons_button:button_darkwood_on
mcl_mangrove:mangrove_trapdoor
mcl_ocean:dead_fire_coral_fan
@@ -1024,6 +1039,7 @@ mcl_jukebox:jukebox
mcl_core:stone_with_coal
vl_hollow_logs:darktree_hollow
mcl_core:stripped_acacia
mcl_potions:absorption_arrow_box
mcl_monster_eggs:monster_egg_stone
mcl_doors:birch_door_t_2
mcl_flowerpots:flower_pot_acaciasapling
@@ -1127,6 +1143,7 @@ mesecons_torch:mesecon_torch_on_wall
mcl_doors:iron_door_t_4
mcl_walls:endbricks_9
mesecons_solarpanel:solar_panel_on
mcl_potions:haste_arrow_box
mesecons_button:button_bamboo_on
mcl_beacons:beacon
mesecons_button:button_bamboo_off
@@ -1346,6 +1363,7 @@ mcl_end:end_rod_brown
mcl_cocoas:cocoa_2
mcl_stairs:slab_ironblock_top
mcl_stairs:slab_ironblock
mcl_potions:night_vision_arrow_box
mcl_stairs:slab_goldblock_top
mcl_doors:dark_oak_door_t_3
mcl_mushrooms:brown_mushroom_block_cap_010101
@@ -1382,6 +1400,7 @@ mcl_core:sprucewood
mcl_stairs:stair_acaciatree_bark_outer
mcl_ocean:fire_coral
mcl_stairs:stair_acaciatree_bark
mcl_potions:darkness_arrow_box
mcl_stairs:stair_jungletree_bark_outer
mcl_stairs:slab_tree_bark_double
mcl_stairs:slab_tree_bark_top
@@ -1421,6 +1440,7 @@ mcl_colorblocks:glazed_terracotta_blue
mcl_walls:diorite_8
mcl_colorblocks:concrete_blue
mcl_stairs:stair_prismarine_inner
mcl_potions:levitation_arrow_box
mcl_colorblocks:glazed_terracotta_pillar_cyan
mcl_colorblocks:glazed_terracotta_cyan
mcl_colorblocks:concrete_cyan
@@ -1431,6 +1451,7 @@ mcl_colorblocks:glazed_terracotta_green
mcl_colorblocks:concrete_green
mcl_stairs:slab_junglewood_double
mcl_colorblocks:glazed_terracotta_yellow
mcl_potions:stone_cloak_arrow_box
mcl_core:junglewood
mcl_colorblocks:concrete_powder_yellow
mcl_stairs:stair_birchwood
@@ -1495,6 +1516,7 @@ mesecons_button:button_cherrywood_on
mcl_deepslate:deepslatebrickswall_12
mcl_stairs:slab_waxed_copper_weathered_cut_top
mesecons_button:button_cherrywood_off
mcl_potions:trolling_arrow_box
mcl_cherry_blossom:cherry_fence_gate_open
mcl_observers:observer_off
mcl_cherry_blossom:cherry_fence
@@ -1525,6 +1547,7 @@ mcl_cherry_blossom:cherry_door_t_3
mcl_cherry_blossom:cherry_door_t_1
mcl_cherry_blossom:cherrysapling
mcl_stairs:slab_copper_oxidized_cut
mcl_potions:fire_resistance_arrow_box
mcl_stairs:stair_waxed_copper_cut
mcl_cherry_blossom:cherrytree_bark
mcl_stairs:stair_waxed_copper_oxidized_cut
@@ -1918,6 +1941,7 @@ mcl_deepslate:deepslatecobbledwall_7
mcl_nether:quartz_pillar
mcl_mushrooms:brown_mushroom_block_cap_100110
mesecons:wire_11100010_on
mcl_potions:poison_arrow_box
mesecons:wire_01110100_off
mcl_stairs:slab_diorite_smooth_top
mcl_stairs:slab_concrete_magenta_double
@@ -1940,6 +1964,7 @@ mcl_stairs:slab_redsandstonesmooth2_double
mcl_chests:white_shulker_box_small
mcl_stairs:stair_bamboo_mosaic_inner
mesecons:wire_10010000_off
mcl_potions:slow_falling_arrow_box
mcl_mushrooms:red_mushroom_block_cap_001100
mcl_mushrooms:red_mushroom_block_cap_100000
mcl_end:end_rod_black
@@ -1972,6 +1997,7 @@ mesecons:wire_10111000_on
mcl_mangrove:mangrove_tree
mcl_walls:cobble_3
mcl_copper:block_cut
mcl_potions:fatigue_arrow_box
mcl_mushrooms:brown_mushroom_block_cap_010010
mcl_fences:dark_oak_fence_gate_open
mesecons:wire_11000100_off
@@ -2142,6 +2168,7 @@ mcl_maps:filled_map_mcl_skins_base_1B47A57FF_male_crea
mcl_chests:yellow_shulker_box
mcl_monster_eggs:monster_egg_stonebrickcracked
mesecons:wire_00110010_on
mcl_potions:withering_arrow_box
mcl_stairs:slab_junglewood_top
mcl_fences:spruce_fence
mcl_stairs:slab_jungletree_bark_top
@@ -2154,10 +2181,12 @@ mesecons_pressureplates:pressure_plate_acaciawood_on
mcl_stairs:stair_andesite
mesecons:wire_01000000_off
mesecons:wire_11100100_on
mcl_potions:healing_arrow_box
mcl_flowerpots:flower_pot_propagule
mcl_stairs:stair_nether_brick
mcl_core:podzol_snow
mesecons:wire_10111001_off
mcl_potions:luck_arrow_box
mesecons:wire_11010001_on
mcl_walls:granite_21
mcl_flowerpots:flower_pot_warped_roots
@@ -2211,6 +2240,7 @@ mesecons:wire_11011001_on
mcl_walls:stonebrickmossy_7
mcl_ocean:seagrass_dirt
mcl_crimson:crimson_trapdoor_open
mcl_potions:bad_luck_arrow_box
mcl_meshhand:character_male_surv
mcl_flowerpots:flower_pot_crimson_roots
mcl_ocean:sea_pickle_2_off_dead_brain_coral_block
@@ -2290,6 +2320,7 @@ mcl_walls:stonebrick_7
mcl_walls:stonebrick_10
mcl_cherry_blossom:pressure_plate_cherrywood_on
mcl_stairs:stair_stonebrick
mcl_potions:regeneration_arrow_box
mcl_walls:stonebrick_13
mcl_chests:magenta_shulker_box_small
mcl_walls:stonebrickmossy_8