FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-28 10:36:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix builtin resource pack having wrong ID

Browse source
This commit is contained in:
apple502j 2024-03-18 03:36:32 +00:00 committed by modmuss50
parent 95a137205b
commit df798a89c5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
View file

@ -94,7 +94,7 @@ public class ModNioResourcePack implements ResourcePack, ModResourcePack {
if (paths.isEmpty()) return null; if (paths.isEmpty()) return null;
String packId = subPath == null ? id : id + "_" + subPath; String packId = subPath != null && modBundled ? id + "_" + subPath : id;
ModNioResourcePack ret = new ModNioResourcePack(packId, mod, paths, type, activationType, modBundled); ModNioResourcePack ret = new ModNioResourcePack(packId, mod, paths, type, activationType, modBundled);
return ret.getNamespaces(type).isEmpty() ? null : ret; return ret.getNamespaces(type).isEmpty() ? null : ret;

2
fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/unittests/SingleVariantItemStorageTests.java
View file

@ -84,7 +84,7 @@ public class SingleVariantItemStorageTests {
tx.commit(); tx.commit();
} }
// Check custom name. // Check custom name.It
assertEquals(customName, inv.getStack(0).getName()); assertEquals(customName, inv.getStack(0).getName());
assertEquals(FluidVariant.blank(), getFluid(inv.getStack(0))); assertEquals(FluidVariant.blank(), getFluid(inv.getStack(0)));
assertEquals(0L, getAmount(inv.getStack(0))); assertEquals(0L, getAmount(inv.getStack(0)));