Merge pull request #1206 from MCTian-mi/fluid-icons

Use AE2 dummy fluid items for quest icons instead of fluid buckets
SymmetricDevs · Dec 31, 2024 · 1c38f34 · 1c38f34
2 parents 69a80ed + 06e77a9
commit 1c38f34
Show file tree

Hide file tree

Showing 116 changed files with 139 additions and 238 deletions.
diff --git a/build/questbook.py b/build/questbook.py
@@ -139,6 +139,15 @@ def delIconCount(entry: dict):
         del entry["properties:10"]["betterquesting:10"]["icon:10"]["Count:3"]
     except:
         pass
+
+def replaceBucketIcons(entry: dict):
+    """replaces fluid buckets in icons with ae2 dummy fluid items"""
+    try:
+        if (entry["properties:10"]["betterquesting:10"]["icon:10"]["id:8"] == "forge:bucketfilled"):
+            entry["properties:10"]["betterquesting:10"]["icon:10"]["id:8"] = "appliedenergistics2:dummy_fluid_item"
+            del entry["properties:10"]["betterquesting:10"]["icon:10"]["tag:10"]["Amount:3"]
+    except:
+        pass
 
 
 def key(entry):
@@ -175,6 +184,8 @@ def build(args):
 
                 delIconCount(currentquest)
 
+                replaceBucketIcons(currentquest)
+
                 if root.endswith("QuestLines"): 
                     knowKeys += i18n(output=questKeys, id=entryid, entry=currentquest, place="ql", prefix=args.prefix)
                 else:

diff --git a/config/betterquesting/DefaultQuests/QuestLines/2.json b/config/betterquesting/DefaultQuests/QuestLines/2.json
@@ -674,15 +674,15 @@
       "id:3": 473,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 276,
-      "y:3": 522
+      "x:3": 297,
+      "y:3": 523
     },
     "95:10": {
       "id:3": 474,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 276,
-      "y:3": 426
+      "x:3": 297,
+      "y:3": 427
     },
     "96:10": {
       "id:3": 500,
@@ -695,8 +695,8 @@
       "id:3": 517,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 276,
-      "y:3": 474
+      "x:3": 297,
+      "y:3": 475
     },
     "98:10": {
       "id:3": 602,
@@ -763,10 +763,10 @@
     },
     "107:10": {
       "id:3": 661,
-      "sizeX:3": 48,
-      "sizeY:3": 48,
-      "x:3": 222,
-      "y:3": 462
+      "sizeX:3": 23,
+      "sizeY:3": 24,
+      "x:3": 245,
+      "y:3": 475
     },
     "108:10": {
       "id:3": 666,
@@ -831,7 +831,7 @@
       "x:3": -306,
       "y:3": 150
     },
-    "124:10": {
+    "117:10": {
       "id:3": 1766162782,
       "sizeX:3": 24,
       "sizeY:3": 24,

diff --git a/config/betterquesting/DefaultQuests/Quests/0/763.json b/config/betterquesting/DefaultQuests/Quests/0/763.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.763.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "creosote"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/232.json b/config/betterquesting/DefaultQuests/Quests/16/232.json
@@ -7,9 +7,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.232.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "nitric_acid"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/233.json b/config/betterquesting/DefaultQuests/Quests/16/233.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.233.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "nitration_mixture"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/234.json b/config/betterquesting/DefaultQuests/Quests/16/234.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.234.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "toluene"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/235.json b/config/betterquesting/DefaultQuests/Quests/16/235.json
@@ -7,9 +7,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.235.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "tnt_slurry"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/403.json b/config/betterquesting/DefaultQuests/Quests/16/403.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.403.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "distilled_water"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/407.json b/config/betterquesting/DefaultQuests/Quests/16/407.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.407.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "glycerol"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/408.json b/config/betterquesting/DefaultQuests/Quests/16/408.json
@@ -8,9 +8,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.408.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "glyceryl_trinitrate"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/409.json b/config/betterquesting/DefaultQuests/Quests/16/409.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.409.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "seed_oil"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/411.json b/config/betterquesting/DefaultQuests/Quests/16/411.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.411.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "benzene"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/414.json b/config/betterquesting/DefaultQuests/Quests/16/414.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.414.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "coal_gas"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/416.json b/config/betterquesting/DefaultQuests/Quests/16/416.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.416.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "ammonia"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/16/569.json b/config/betterquesting/DefaultQuests/Quests/16/569.json
@@ -9,9 +9,8 @@
       "desc:8": "susy.quest.db.569.desc",
       "frame:8": "GATE",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "reformed_syngas"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/390.json b/config/betterquesting/DefaultQuests/Quests/19/390.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.390.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "liquid_oxygen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/432.json b/config/betterquesting/DefaultQuests/Quests/19/432.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.432.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "hot_hp_oxygen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/435.json b/config/betterquesting/DefaultQuests/Quests/19/435.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.435.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "hp_oxygen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/436.json b/config/betterquesting/DefaultQuests/Quests/19/436.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.436.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "cold_hp_oxygen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/675.json b/config/betterquesting/DefaultQuests/Quests/19/675.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.675.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "liquid_hydrogen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/677.json b/config/betterquesting/DefaultQuests/Quests/19/677.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.677.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "liquid_helium"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/19/882.json b/config/betterquesting/DefaultQuests/Quests/19/882.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.882.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "liquid_nitrogen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/2/121.json b/config/betterquesting/DefaultQuests/Quests/2/121.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.121.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "syngas"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/2/240.json b/config/betterquesting/DefaultQuests/Quests/2/240.json
@@ -6,9 +6,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.240.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "glue"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/2/661.json b/config/betterquesting/DefaultQuests/Quests/2/661.json
@@ -7,9 +7,8 @@
       "desc:8": "susy.quest.db.661.desc",
       "frame:8": "GATE",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "sperrylite_waste"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/20/747.json b/config/betterquesting/DefaultQuests/Quests/20/747.json
@@ -11,9 +11,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.747.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "steam"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/22/247.json b/config/betterquesting/DefaultQuests/Quests/22/247.json
@@ -3,9 +3,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.247.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "hydrogen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/22/248.json b/config/betterquesting/DefaultQuests/Quests/22/248.json
@@ -3,9 +3,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.248.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "helium"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/22/253.json b/config/betterquesting/DefaultQuests/Quests/22/253.json
@@ -3,9 +3,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.253.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "nitrogen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/22/254.json b/config/betterquesting/DefaultQuests/Quests/22/254.json
@@ -3,9 +3,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.254.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "oxygen"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/22/255.json b/config/betterquesting/DefaultQuests/Quests/22/255.json
@@ -3,9 +3,8 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.db.255.desc",
       "icon:10": {
-        "id:8": "forge:bucketfilled",
+        "id:8": "appliedenergistics2:dummy_fluid_item",
         "tag:10": {
-          "Amount:3": 1000,
           "FluidName:8": "fluorine"
         }
       },