diff --git a/mods/ITEMS/mcl_fences/init.lua b/mods/ITEMS/mcl_fences/init.lua index e8ec01b78..a081f3eeb 100644 --- a/mods/ITEMS/mcl_fences/init.lua +++ b/mods/ITEMS/mcl_fences/init.lua @@ -230,9 +230,12 @@ mcl_fences.register_fence_gate = function(id, fence_gate_name, texture, groups, return gate_id, open_gate_id end -mcl_fences.register_fence_and_fence_gate = function(id, fence_name, fence_gate_name, texture, groups, hardness, blast_resistance, connects_to, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close) - local fence_id = mcl_fences.register_fence(id, fence_name, texture, groups, hardness, blast_resistance, connects_to, sounds) - local gate_id, open_gate_id = mcl_fences.register_fence_gate(id, fence_gate_name, texture, groups, hardness, blast_resistance, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close) +mcl_fences.register_fence_and_fence_gate = function(id, fence_name, fence_gate_name, texture_fence, groups, hardness, blast_resistance, connects_to, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close, texture_fence_gate) + if texture_fence_gate == nil then + texture_fence_gate = texture_fence + end + local fence_id = mcl_fences.register_fence(id, fence_name, texture_fence, groups, hardness, blast_resistance, connects_to, sounds) + local gate_id, open_gate_id = mcl_fences.register_fence_gate(id, fence_gate_name, texture_fence_gate, groups, hardness, blast_resistance, sounds, sound_open, sound_close, sound_gain_open, sound_gain_close) return fence_id, gate_id, open_gate_id end @@ -241,12 +244,12 @@ local wood_connect = {"group:fence_wood"} local wood_sounds = mcl_sounds.node_sound_wood_defaults() local woods = { - {"", "Oak Fence", "Oak Fence Gate", "default_wood.png", "mcl_core:wood"}, - {"spruce", "Spruce Fence", "Spruce Fence Gate", "mcl_core_planks_spruce.png", "mcl_core:sprucewood"}, - {"birch", "Birch Fence", "Birch Fence Gate", "mcl_core_planks_birch.png", "mcl_core:birchwood"}, - {"jungle", "Jungle Fence", "Jungle Fence Gate", "default_junglewood.png", "mcl_core:junglewood"}, - {"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "mcl_core_planks_big_oak.png", "mcl_core:darkwood"}, - {"acacia", "Acacia Fence", "Acacia Fence Gate", "default_acacia_wood.png", "mcl_core:acaciawood"}, + {"", "Oak Fence", "Oak Fence Gate", "mcl_fences_fence_oak.png", "mcl_fences_fence_gate_oak.png", "mcl_core:wood"}, + {"spruce", "Spruce Fence", "Spruce Fence Gate", "mcl_fences_fence_spruce.png", "mcl_fences_fence_gate_spruce.png", "mcl_core:sprucewood"}, + {"birch", "Birch Fence", "Birch Fence Gate", "mcl_fences_fence_birch.png", "mcl_fences_fence_gate_birch.png", "mcl_core:birchwood"}, + {"jungle", "Jungle Fence", "Jungle Fence Gate", "mcl_fences_fence_jungle.png", "mcl_fences_fence_gate_jungle.png", "mcl_core:junglewood"}, + {"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "mcl_fences_fence_big_oak.png", "mcl_fences_fence_gate_big_oak.png", "mcl_core:darkwood"}, + {"acacia", "Acacia Fence", "Acacia Fence Gate", "mcl_fences_fence_acacia.png", "mcl_fences_fence_gate_acacia.png", "mcl_core:acaciawood"}, } for w=1, #woods do @@ -279,7 +282,7 @@ end -- Nether Brick Fence (without fence gate!) -mcl_fences.register_fence("nether_brick_fence", "Nether Brick Fence", "mcl_nether_nether_brick.png", {pickaxey=1, deco_block=1, fence_nether_brick=1}, 2, 30, {"group:fence_nether_brick"}, mcl_sounds.node_sound_stone_defaults()) +mcl_fences.register_fence("nether_brick_fence", "Nether Brick Fence", "mcl_fences_fence_nether_brick.png", {pickaxey=1, deco_block=1, fence_nether_brick=1}, 2, 30, {"group:fence_nether_brick"}, mcl_sounds.node_sound_stone_defaults()) minetest.register_craft({ output = 'mcl_fences:nether_brick_fence 6', diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_acacia.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_acacia.png new file mode 100644 index 000000000..85dae567f Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_acacia.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_big_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_big_oak.png new file mode 100644 index 000000000..de8648e8e Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_big_oak.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_birch.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_birch.png new file mode 100644 index 000000000..96121e128 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_birch.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_acacia.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_acacia.png new file mode 100644 index 000000000..e18dc9cc2 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_acacia.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_big_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_big_oak.png new file mode 100644 index 000000000..f7c0eccd3 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_big_oak.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_birch.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_birch.png new file mode 100644 index 000000000..7d4efc7ca Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_birch.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_jungle.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_jungle.png new file mode 100644 index 000000000..5ce39690c Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_jungle.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_mask.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_mask.png index bea12a69a..eeefdf704 100644 Binary files a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_mask.png and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_mask.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_oak.png new file mode 100644 index 000000000..348c8b24f Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_oak.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_spruce.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_spruce.png new file mode 100644 index 000000000..5c8a0bb57 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_gate_spruce.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_jungle.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_jungle.png new file mode 100644 index 000000000..dbc5684ac Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_jungle.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_mask.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_mask.png index 73edee2ba..dfa9b34d9 100644 Binary files a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_mask.png and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_mask.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_nether_brick.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_nether_brick.png new file mode 100644 index 000000000..e924f8389 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_nether_brick.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_oak.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_oak.png new file mode 100644 index 000000000..6c48e53e8 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_oak.png differ diff --git a/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_spruce.png b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_spruce.png new file mode 100644 index 000000000..2ee52abf6 Binary files /dev/null and b/mods/ITEMS/mcl_fences/textures/mcl_fences_fence_spruce.png differ diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 401f0043c..5a48235cb 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -817,3 +817,18 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,melon_stem_connected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_melon_stem_connected.png,,,,,, /assets/minecraft/textures/blocks,pumpkin_stem_disconnected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_pumpkin_stem_disconnected.png,,,,,, /assets/minecraft/textures/blocks,melon_stem_disconnected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_melon_stem_disconnected.png,,,,,, +/assets/minecraft/textures/blocks,fence_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_acacia.png,,,,,, +/assets/minecraft/textures/blocks,fence_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_big_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_birch.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_acacia.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_big_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_birch.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_jungle.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_mask.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_mask.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_gate_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_spruce.png,,,,,, +/assets/minecraft/textures/blocks,fence_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_jungle.png,,,,,, +/assets/minecraft/textures/blocks,fence_mask.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_mask.png,,,,,, +/assets/minecraft/textures/blocks,fence_nether_brick.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_nether_brick.png,,,,,, +/assets/minecraft/textures/blocks,fence_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_oak.png,,,,,, +/assets/minecraft/textures/blocks,fence_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_spruce.png,,,,,,