diff --git a/Mcblend Source/Materials/Materials.py b/Mcblend Source/Materials/Materials.py index 68690b43..43059ac0 100644 --- a/Mcblend Source/Materials/Materials.py +++ b/Mcblend Source/Materials/Materials.py @@ -136,7 +136,6 @@ def fix_world(): for n in connected_nodes: if n.type == "TEX_IMAGE" and n.image: image_texture_node = n - debugger(connected_nodes) if node.type == "GROUP": if "Lazy Biome Color Fix" == node.node_tree.name: @@ -198,7 +197,7 @@ def fix_world(): if WProperties.lazy_biome_fix: material_parts = image_texture_node.image.name.lower().replace(".png", "").replace("-", "_").split("_") - if any(part in material_parts for part in ("grass", "water", "leaves", "stem")) and all(part not in material_parts for part in ("cherry", "side")): + if any(part in material_parts for part in ("grass", "water", "leaves", "stem")) or ("redstone" and "dust" in material_parts) and all(part not in material_parts for part in ("cherry", "side")): if lbcf_node is None: if "Lazy Biome Color Fix" not in bpy.data.node_groups: try: @@ -217,7 +216,10 @@ def fix_world(): material.node_tree.links.new(lbcf_node.outputs[0], PBSDF.inputs["Base Color"]) if "water" in material_parts: - lbcf_node.inputs["Water"].default_value = True + lbcf_node.inputs["Mode"].default_value = 2 + + if "redstone" in material_parts: + lbcf_node.inputs["Mode"].default_value = 3 else: Absolute_Solver("m002", slot) else: @@ -496,7 +498,6 @@ def setproceduralpbr(): for n in connected_nodes: if n.type == "TEX_IMAGE" and n.image: image = n.image - debugger(connected_nodes) if node.type == "BUMP": bump_node = node diff --git a/Mcblend Source/Materials/Nodes.blend b/Mcblend Source/Materials/Nodes.blend index 0e10d7b9..8f89a00a 100644 Binary files a/Mcblend Source/Materials/Nodes.blend and b/Mcblend Source/Materials/Nodes.blend differ diff --git a/Mcblend Source/Resource_Packs.py b/Mcblend Source/Resource_Packs.py index 93977fed..0344c91c 100644 --- a/Mcblend Source/Resource_Packs.py +++ b/Mcblend Source/Resource_Packs.py @@ -7,11 +7,10 @@ def get_resource_packs(): return bpy.context.scene["resource_packs"] -def set_resource_packs(resource_packs, debug=None): +def set_resource_packs(resource_packs): bpy.context.scene["resource_packs"] = resource_packs - if debug is not None: - print(f"Resource Packs: {bpy.context.scene['resource_packs']}") + debugger(f"Resource Packs: {bpy.context.scene['resource_packs']}") Launchers = { "Mojang": ".minecraft\\versions", diff --git a/Mcblend.blend b/Mcblend.blend index 19de2882..0452252b 100644 Binary files a/Mcblend.blend and b/Mcblend.blend differ diff --git a/tex/MWO_redstone_dust_angled.png b/tex/MWO_redstone_dust_angled.png new file mode 100644 index 00000000..5af16583 Binary files /dev/null and b/tex/MWO_redstone_dust_angled.png differ diff --git a/tex/MWO_redstone_dust_line1_off.png b/tex/MWO_redstone_dust_line1_off.png new file mode 100644 index 00000000..e84598ba Binary files /dev/null and b/tex/MWO_redstone_dust_line1_off.png differ diff --git a/tex/redstone_dust_line1_y.png b/tex/redstone_dust_line1_y.png new file mode 100644 index 00000000..9b1b7771 Binary files /dev/null and b/tex/redstone_dust_line1_y.png differ