Skip to content

Commit 7faa29e

Browse files
committed
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2 parents 18722be + 349f58b commit 7faa29e

File tree

3 files changed

+144
-0
lines changed

3 files changed

+144
-0
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ko_fi: embeddedt

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

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

31+
/**
32+
* These folders will have all textures stitched onto the atlas when dynamic resources is enabled.
33+
*/
34+
public static String[] getExtraTextureFolders() {
35+
return new String[] {
36+
"attachment",
37+
"bettergrass",
38+
"block",
39+
"blocks",
40+
"cape",
41+
"entity/bed",
42+
"entity/chest",
43+
"item",
44+
"items",
45+
"model",
46+
"models",
47+
"part",
48+
"pipe",
49+
"ropebridge",
50+
"runes",
51+
"solid_block",
52+
"spell_effect",
53+
"spell_projectile"
54+
};
55+
}
56+
3157
private static <T extends Comparable<T>, V extends T> BlockState setPropertyGeneric(BlockState state, Property<T> prop, Object o) {
3258
return state.setValue(prop, (V)o);
3359
}

0 commit comments

Comments
 (0)