GeyserMC-Mirror/Rainbow
1
0
Fork 0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00
Code Issues Releases Activity

Allow custom pack manifests in BedrockPack

Browse Source
This commit is contained in:
Eclipse
2025-10-14 11:09:16 +00:00
parent 6a1fe997ba
commit 269a18b9df
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
View File

@@ -35,6 +35,7 @@ import java.util.function.UnaryOperator;
public class BedrockPack { public class BedrockPack {
private final String name; private final String name;
private final PackManifest manifest;
private final PackPaths paths; private final PackPaths paths;
private final PackSerializer serializer; private final PackSerializer serializer;
@@ -45,13 +46,13 @@ public class BedrockPack {
private final IntSet customModelDataMapped = new IntOpenHashSet(); private final IntSet customModelDataMapped = new IntOpenHashSet();
private final PackContext context; private final PackContext context;
private final PackManifest manifest;
private final ProblemReporter.Collector reporter; private final ProblemReporter.Collector reporter;
public BedrockPack(String name, PackPaths paths, PackSerializer serializer, AssetResolver assetResolver, public BedrockPack(String name, PackManifest manifest, PackPaths paths, PackSerializer serializer, AssetResolver assetResolver,
GeometryRenderer geometryRenderer, ProblemReporter.Collector reporter, GeometryRenderer geometryRenderer, ProblemReporter.Collector reporter,
boolean reportSuccesses) { boolean reportSuccesses) {
this.name = name; this.name = name;
this.manifest = manifest;
this.paths = paths; this.paths = paths;
this.serializer = serializer; this.serializer = serializer;
@@ -63,7 +64,6 @@ public class BedrockPack {
} }
bedrockItems.add(item); bedrockItems.add(item);
}, assetResolver, geometryRenderer, texturesToExport::add, reportSuccesses); }, assetResolver, geometryRenderer, texturesToExport::add, reportSuccesses);
manifest = defaultManifest(name);
this.reporter = reporter; this.reporter = reporter;
} }
@@ -165,11 +165,6 @@ public class BedrockPack {
return reporter; return reporter;
} }
private static PackManifest defaultManifest(String name) {
return new PackManifest(new PackManifest.Header(name, PackConstants.DEFAULT_PACK_DESCRIPTION, UUID.randomUUID(), BedrockVersion.of(0), PackConstants.ENGINE_VERSION),
List.of(new PackManifest.Module(name, PackConstants.DEFAULT_PACK_DESCRIPTION, UUID.randomUUID(), BedrockVersion.of(0))));
}
public static Builder builder(String name, Path mappingsPath, Path packRootPath, PackSerializer packSerializer, AssetResolver assetResolver) { public static Builder builder(String name, Path mappingsPath, Path packRootPath, PackSerializer packSerializer, AssetResolver assetResolver) {
return new Builder(name, mappingsPath, packRootPath, packSerializer, assetResolver); return new Builder(name, mappingsPath, packRootPath, packSerializer, assetResolver);
} }
@@ -187,6 +182,7 @@ public class BedrockPack {
private final Path packRootPath; private final Path packRootPath;
private final PackSerializer packSerializer; private final PackSerializer packSerializer;
private final AssetResolver assetResolver; private final AssetResolver assetResolver;
private PackManifest manifest;
private UnaryOperator<Path> attachablesPath = resolve(ATTACHABLES_DIRECTORY); private UnaryOperator<Path> attachablesPath = resolve(ATTACHABLES_DIRECTORY);
private UnaryOperator<Path> geometryPath = resolve(GEOMETRY_DIRECTORY); private UnaryOperator<Path> geometryPath = resolve(GEOMETRY_DIRECTORY);
private UnaryOperator<Path> animationPath = resolve(ANIMATION_DIRECTORY); private UnaryOperator<Path> animationPath = resolve(ANIMATION_DIRECTORY);
@@ -204,6 +200,12 @@ public class BedrockPack {
this.reporter = new ProblemReporter.Collector(() -> "Bedrock pack " + name + " "); this.reporter = new ProblemReporter.Collector(() -> "Bedrock pack " + name + " ");
this.packSerializer = packSerializer; this.packSerializer = packSerializer;
this.assetResolver = assetResolver; this.assetResolver = assetResolver;
manifest = defaultManifest(name);
}
public Builder withManifest(PackManifest manifest) {
this.manifest = manifest;
return this;
} }
public Builder withAttachablesPath(Path absolute) { public Builder withAttachablesPath(Path absolute) {
@@ -275,12 +277,17 @@ public class BedrockPack {
PackPaths paths = new PackPaths(mappingsPath, packRootPath, attachablesPath.apply(packRootPath), PackPaths paths = new PackPaths(mappingsPath, packRootPath, attachablesPath.apply(packRootPath),
geometryPath.apply(packRootPath), animationPath.apply(packRootPath), manifestPath.apply(packRootPath), geometryPath.apply(packRootPath), animationPath.apply(packRootPath), manifestPath.apply(packRootPath),
itemAtlasPath.apply(packRootPath), Optional.ofNullable(packZipFile)); itemAtlasPath.apply(packRootPath), Optional.ofNullable(packZipFile));
return new BedrockPack(name, paths, packSerializer, assetResolver, geometryRenderer, reporter, reportSuccesses); return new BedrockPack(name, manifest, paths, packSerializer, assetResolver, geometryRenderer, reporter, reportSuccesses);
} }
private static UnaryOperator<Path> resolve(Path child) { private static UnaryOperator<Path> resolve(Path child) {
return root -> root.resolve(child); return root -> root.resolve(child);
} }
private static PackManifest defaultManifest(String name) {
return new PackManifest(new PackManifest.Header(name, PackConstants.DEFAULT_PACK_DESCRIPTION, UUID.randomUUID(), BedrockVersion.of(0), PackConstants.ENGINE_VERSION),
List.of(new PackManifest.Module(name, PackConstants.DEFAULT_PACK_DESCRIPTION, UUID.randomUUID(), BedrockVersion.of(0))));
}
} }
public enum MappingResult { public enum MappingResult {