Merge 1.19.4 into 1.20

Author: embeddedt

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

@@ -144,10 +144,14 @@ private ImmutableList<BlockState> fetchBlocks(StateDefinition<Block, BlockState>
 
     private BiFunction<ResourceLocation, Material, TextureAtlasSprite> textureGetter;
 
-    @Inject(method = "bakeModels", at = @At("HEAD"), cancellable = true)
-    private void skipBake(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
+    @Inject(method = "bakeModels", at = @At("HEAD"))
+    private void storeTextureGetter(BiFunction<ResourceLocation, Material, TextureAtlasSprite> getter, CallbackInfo ci) {
         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();
     }
 
     /**

scripts/propagate.sh

@@ -33,7 +33,7 @@ for version in "${all_versions[@]}"; do
     if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
         echo -n "merging $our_version into ${version}... "
         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
             echo "failed, this merge must be done manually using the provided shell"
         else