Skip to content

Improve asset bundle support for Rimworld 1.6. #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Epicguru merged 1 commit into from
Aug 13, 2025
Merged

Improve asset bundle support for Rimworld 1.6. #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 96 additions & 13 deletions Source/1.6/AMRetextureSupport/RetextureUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
using JetBrains.Annotations;
using UnityEngine;
using Verse;
using LudeonTK;
Expand Down Expand Up @@ -195,18 +196,26 @@ public static IEnumerable<ActiveTextureReport> GetModWeaponReports(ModContentPac
private static IEnumerable<(ModContentPack mod, Texture2D texture)> ScanAssetBundles(string texPath)
{
var mods = LoadedModManager.RunningModsListForReading;
string path = Path.Combine("Assets", "Data");
string baseBundlePath = Path.Combine("Assets", "Data");

for (int i = mods.Count - 1; i >= 0; i--)
{
string path2 = Path.Combine(path, mods[i].FolderName);
foreach (AssetBundle assetBundle in mods[i].assetBundles.loadedAssetBundles)
var mod = mods[i];

string dirForBundleWithFolderName = Path.Combine(baseBundlePath, mod.FolderName);
string dirForBundleWithPackageId = Path.Combine(baseBundlePath, mod.PackageIdPlayerFacing);
string path1 = Path.Combine(Path.Combine(dirForBundleWithFolderName, GenFilePaths.ContentPath<Texture2D>()), texPath).ToLowerInvariant();
string path2 = Path.Combine(Path.Combine(dirForBundleWithPackageId, GenFilePaths.ContentPath<Texture2D>()), texPath).ToLowerInvariant();

foreach (AssetBundle bundle in mod.assetBundles.loadedAssetBundles)
{
string str = Path.Combine(Path.Combine(path2, GenFilePaths.ContentPath<Texture2D>()), texPath);

foreach (string ext in ModAssetBundlesHandler.TextureExtensions)
{
var loaded = assetBundle.LoadAsset<Texture2D>(str + ext);
var loaded = bundle.LoadAsset<Texture2D>(path1 + ext);
if (loaded != null)
yield return (mods[i], loaded);

loaded = bundle.LoadAsset<Texture2D>(path2 + ext);
if (loaded != null)
yield return (mods[i], loaded);
}
Expand All @@ -221,19 +230,93 @@ public static IEnumerable<ActiveTextureReport> GetModWeaponReports(ModContentPac
{
var mod = mods[i];

// Textures from the textures folder.
var textures = mod.textures?.contentList;
if (textures == null)
continue;

foreach (var pair in textures)
if (textures != null)
{
foreach ((string path, Texture2D texture) in textures)
{
yield return (mod, texture, path);
}
}

// Textures from asset bundles.
foreach (var tuple in GetTexturesFromBundles(mod))
{
yield return (mod, pair.Value, pair.Key);
yield return tuple;
}
}
}

private static IEnumerable<(ModContentPack mod, Texture2D texture, string path)> GetTexturesFromBundles(ModContentPack mod)
{
// Ignore core mods, they don't use asset bundles for the main textures and would cause unnecessary performance overhead.
if (mod.IsCoreMod || mod.IsOfficialMod)
yield break;

if (mod.assetBundles == null || mod.assetBundles.loadedAssetBundles.Count == 0)
yield break;

string[] validExtensions = ModAssetBundlesHandler.TextureExtensions;

string modsDir = Path.Combine("Assets", "Data");
string dirForBundleWithFolderName = Path.Combine(modsDir, mod.FolderName);
string dirForBundleWithPackageId = Path.Combine(modsDir, mod.PackageIdPlayerFacing);

const string FOLDER_PATH = ""; // Want to get all textures in the root Textures/ folder.
string pathWithoutExtWithModName = Path.Combine(Path.Combine(dirForBundleWithFolderName, GenFilePaths.ContentPath<Texture2D>()).Replace('\\', '/'), FOLDER_PATH).ToLower();
string pathWithoutExtWithPackageId = Path.Combine(Path.Combine(dirForBundleWithPackageId, GenFilePaths.ContentPath<Texture2D>()).Replace('\\', '/'), FOLDER_PATH).ToLower();
string text2 = pathWithoutExtWithModName;
if (text2[^1] != '/')
pathWithoutExtWithModName += '/';

string text3 = pathWithoutExtWithPackageId;
if (text3[^1] != '/')
pathWithoutExtWithPackageId += '/';

int bundleCount = mod.assetBundles.loadedAssetBundles.Count;
for (int i = 0; i < bundleCount; i++)
{
var bundle = mod.assetBundles.loadedAssetBundles[i];
var namesTrie = mod.AllAssetNamesInBundleTrie(i);

// Gets names of files inside the Textures/ folder inside the bundle.
var paths1 = namesTrie.GetByPrefix(pathWithoutExtWithModName);
var paths2 = namesTrie.GetByPrefix(pathWithoutExtWithPackageId);

foreach (string texPath in paths1.Concat(paths2))
{
// Ignore files that are not textures.
string ext = Path.GetExtension(texPath);
if (!validExtensions.Contains(ext))
continue;

var loadedTexture = bundle.LoadAsset<Texture2D>(texPath);
if (loadedTexture == null)
{
Log.Warning($"[MA] Failed to load texture '{texPath}' from asset bundle '{bundle.name}' ({i}) in mod '{mod.Name}' ({mod.PackageId})");
continue;
}

string relativePath = texPath.Replace(pathWithoutExtWithModName, "").Replace(pathWithoutExtWithPackageId, "");

// Remove leading slash.
if (relativePath.StartsWith("/"))
relativePath = relativePath[1..];

// Remove extension.
relativePath = relativePath[..relativePath.LastIndexOf('.')];

// Normalize slashes.
relativePath = relativePath.Replace('\\', '/');

yield return (mod, loadedTexture, relativePath);
}
}

}

[DebugOutput("Melee Animation")]
[DebugOutput("Melee Animation"), UsedImplicitly]
private static void LogAllTextureReports()
{
var meleeWeapons = DefDatabase<ThingDef>.AllDefsListForReading.Where(d => IsMeleeWeapon(d));
Expand Down Expand Up @@ -292,7 +375,7 @@ private static string ResolveTexturePath(ThingDef weapon, int pass, out bool can
if (textures == null)
continue;

string prefix = (xmlPath[xmlPath.Length - 1] == '/') ? xmlPath : xmlPath + "/";
string prefix = (xmlPath[^1] == '/') ? xmlPath : xmlPath + "/";
foreach (string path in textures.GetByPrefix(prefix).OrderBy(s => s))
{
return path;
Expand Down
1 change: 1 addition & 0 deletions Source/1.6/AnimationMod.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CAI/@EntryIndexedValue">CAI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MCP/@EntryIndexedValue">MCP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MPB/@EntryIndexedValue">MPB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"&gt;&lt;ElementKinds&gt;&lt;Kind Name="NAMESPACE" /&gt;&lt;Kind Name="CLASS" /&gt;&lt;Kind Name="STRUCT" /&gt;&lt;Kind Name="ENUM" /&gt;&lt;Kind Name="DELEGATE" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bezier/@EntryIndexedValue">True</s:Boolean>
Expand Down
Loading