R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.4 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-06-14 22:14:23 -04:00
commit 42d41eb0f7
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -144,10 +144,14 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
private BiFunction<ResourceLocation, Material, TextureAtlasSprite> textureGetter; private BiFunction<ResourceLocation, Material, TextureAtlasSprite> textureGetter;
@Inject(method = "bakeModels", at = @At("HEAD"), cancellable = true) @Inject(method = "bakeModels", at = @At("HEAD"))
private void skipBake(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) { private void storeTextureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
textureGetter = getter; textureGetter = getter;
ci.cancel(); }
@Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;"))
private Set skipBakingModels(Map map) {
return Collections.emptySet();
} }
/** /**

2
scripts/propagate.sh
View File

@ -33,7 +33,7 @@ for version in "${all_versions[@]}"; do
if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
echo -n "merging $our_version into ${version}... " echo -n "merging $our_version into ${version}... "
git checkout -b propagations/$version origin/$version &>/dev/null git checkout -b propagations/$version origin/$version &>/dev/null
if ! git merge --no-commit propagations/$our_version >/dev/null; then if ! git merge --no-commit propagations/$our_version &>/dev/null; then
merge_failed=yes merge_failed=yes
echo "failed, this merge must be done manually using the provided shell" echo "failed, this merge must be done manually using the provided shell"
else else