Skip to content

Commit 2629cd4

Browse files
committed
Add runes/ to legacy texture folder list
1 parent b54c675 commit 2629cd4

File tree

2 files changed

+27
-19
lines changed

2 files changed

+27
-19
lines changed

common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,32 @@ public class ModelBakeryHelpers {
5757
*/
5858
public static final int MAX_MODEL_LIFETIME_SECS = 300;
5959

60+
/**
61+
* These folders will have all textures stitched onto the atlas when dynamic resources is enabled.
62+
*/
63+
public static String[] getExtraTextureFolders() {
64+
return new String[] {
65+
"attachment",
66+
"bettergrass",
67+
"block",
68+
"blocks",
69+
"cape",
70+
"entity/bed",
71+
"entity/chest",
72+
"item",
73+
"items",
74+
"model",
75+
"models",
76+
"part",
77+
"pipe",
78+
"ropebridge",
79+
"runes",
80+
"solid_block",
81+
"spell_effect",
82+
"spell_projectile"
83+
};
84+
}
85+
6086
private static JsonElement parseStream(InputStream stream) {
6187
JsonParser parser = new JsonParser();
6288
JsonReader jsonReader = new JsonReader(new InputStreamReader(stream, StandardCharsets.UTF_8));

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -254,25 +254,7 @@ private Object collectExtraTextures(Stream<Material> instance, Collector<?, ?, ?
254254
blockStateFiles, modelFiles, this.missingModel, json -> BlockModel.GSON.fromJson(json, BlockModel.class),
255255
this::getModel);
256256
/* take every texture from these folders (1.19.3+ emulation) */
257-
String[] extraFolders = new String[] {
258-
"attachment",
259-
"bettergrass",
260-
"block",
261-
"blocks",
262-
"cape",
263-
"entity/bed",
264-
"entity/chest",
265-
"item",
266-
"items",
267-
"model",
268-
"models",
269-
"part",
270-
"pipe",
271-
"ropebridge",
272-
"solid_block",
273-
"spell_effect",
274-
"spell_projectile"
275-
};
257+
String[] extraFolders = ModelBakeryHelpers.getExtraTextureFolders();
276258
for(String folder : extraFolders) {
277259
Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.endsWith(".png"));
278260
for(ResourceLocation rl : textureLocations) {

0 commit comments

Comments
 (0)