Merge remote-tracking branch 'origin/1.18' into 1.19.2
This commit is contained in:
commit
dcd30d34da
1
.github/workflows/gradle.yml
vendored
1
.github/workflows/gradle.yml
vendored
|
|
@ -16,6 +16,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
|
cache: 'gradle'
|
||||||
- name: Grant execute permission for gradlew
|
- name: Grant execute permission for gradlew
|
||||||
run: chmod +x gradlew
|
run: chmod +x gradlew
|
||||||
- name: Build the mod
|
- name: Build the mod
|
||||||
|
|
|
||||||
|
|
@ -238,11 +238,14 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
|
||||||
this::getModel);
|
this::getModel);
|
||||||
/* take every texture from these folders (1.19.3+ emulation) */
|
/* take every texture from these folders (1.19.3+ emulation) */
|
||||||
String[] extraFolders = new String[] {
|
String[] extraFolders = new String[] {
|
||||||
|
"attachment",
|
||||||
|
"bettergrass",
|
||||||
"block",
|
"block",
|
||||||
"blocks",
|
"blocks",
|
||||||
|
"cape",
|
||||||
"item",
|
"item",
|
||||||
"items",
|
"items",
|
||||||
"bettergrass"
|
"pipe"
|
||||||
};
|
};
|
||||||
for(String folder : extraFolders) {
|
for(String folder : extraFolders) {
|
||||||
Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.getPath().endsWith(".png")).keySet();
|
Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.getPath().endsWith(".png")).keySet();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user