Merge remote-tracking branch 'origin/1.18' into 1.19.2

This commit is contained in:
embeddedt 2023-05-08 18:05:08 -04:00
commit dcd30d34da
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 5 additions and 1 deletions

View File

@ -16,6 +16,7 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
cache: 'gradle'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build the mod

View File

@ -238,11 +238,14 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
this::getModel);
/* take every texture from these folders (1.19.3+ emulation) */
String[] extraFolders = new String[] {
"attachment",
"bettergrass",
"block",
"blocks",
"cape",
"item",
"items",
"bettergrass"
"pipe"
};
for(String folder : extraFolders) {
Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.getPath().endsWith(".png")).keySet();