Multiple Texture Users Fix

Aspirata · Jun 12, 2024 · 96287e0 · 96287e0
1 parent 4920971
commit 96287e0
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 151 deletions.
diff --git a/Animated Textures Test.blend b/Animated Textures Test.blend
diff --git a/Mcblend Source/Data.py b/Mcblend Source/Data.py
@@ -22,6 +22,11 @@
 
 Absolute_Solver_Errors = {
 
+    "000": {
+        "Error Name": "Absolute Solver Error",
+        "Description": "Absolute Solver Can't Display This Error - {Data}, Please Report To Aspirata",
+    },
+
     "001": {
         "Error Name": "Unknown",
         "Description": "An Unknown Error",
@@ -254,8 +259,6 @@
 
 SSS_Materials = ["leaves", "grass", "tulip", "oxeye_daisy", "dandelion", "poppy", "blue_orchid", "torchflower", "lily_of_the_valley", "cornflower", "allium", "azure bluet"]
 
-Biome_Fix_Materials = ["leaves", "grass", "water"]
-
 Metal = ["iron", "gold", "copper", "diamond", "netherite", "minecart", "lantern", "chain", "anvil", "clock", "cauldron", "spyglass", "rail"]
 
 Reflective = ["glass", "ender", "amethyst", "water", "emerald"]

diff --git a/Mcblend Source/MCB_API.py b/Mcblend Source/MCB_API.py
@@ -15,17 +15,20 @@ def InitOnStart():
 
 def Absolute_Solver(error_code="None", data=None, err=None, error_name=None, description=None):
 
-    def GetASText(error_code, text, data=None):
+    try:
+        def GetASText(error_code, text, data=None):
+            if data != None:
+                return Absolute_Solver_Errors[error_code][text].format(Data=data)
+            else:
+                return Absolute_Solver_Errors[error_code][text]
+
         if data != None:
-            return Absolute_Solver_Errors[error_code][text].format(Data=data)
+            bpy.ops.wm.absolute_solver('INVOKE_DEFAULT', Error_Code = error_code, Error_Name = (error_name if error_code != None else GetASText(error_code, "Error Name")), Description=(GetASText(error_code, 'Description')) if description == None else description.format(Data=data), Tech_Things = (str(err) if err != None else "None"))
         else:
-            return Absolute_Solver_Errors[error_code][text]
+            bpy.ops.wm.absolute_solver('INVOKE_DEFAULT', Error_Code = error_code, Error_Name = (error_name if error_code != None else GetASText(error_code, "Error Name")), Description=(GetASText(error_code, 'Description')) if description == None else description, Tech_Things = (str(err) if err != None else "None"))
+    except:
+        bpy.ops.wm.absolute_solver('INVOKE_DEFAULT', Error_Code = "000", Error_Name = GetASText("000", "Error Name"), Description=GetASText("000", 'Description', error_code if error_code != None else error_name), Tech_Things = str(traceback.format_exc()))
 
-    if data != None:
-        bpy.ops.wm.absolute_solver('INVOKE_DEFAULT', Error_Code = error_code, Error_Name = (error_name if error_code != None else GetASText(error_code, 'Error Name')), Description=(GetASText(error_code, 'Description')) if description == None else description.format(Data=data), Tech_Things = str(err) if err != None else "None")
-    else:
-        bpy.ops.wm.absolute_solver('INVOKE_DEFAULT', Error_Code = error_code, Error_Name = (error_name if error_code != None else GetASText(error_code, 'Error Name')), Description=(GetASText(error_code, 'Description')) if description == None else description, Tech_Things = str(err) if err != None else "None")
-
 def checkconfig(name):
     if "const" in main_directory:
         return Preferences_List["Dev"][name]

diff --git a/Mcblend Source/Materials/Materials.blend b/Mcblend Source/Materials/Materials.blend