From 47959cddefcc7f26ece25887a132abbf473a1902 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:19:23 -0400
Subject: [PATCH] Port patch to 1.19

---
 .../mixin/perf/dynamic_resources/ModelBakeryMixin.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index 35f3a916..582698d6 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -178,14 +178,14 @@ public abstract class ModelBakeryMixin {
         gatherModelMaterials(materialSet);
     }
 
-    @Redirect(method = "processLoading", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V", ordinal = 0), remap = false)
+    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V", ordinal = 0))
     private void fetchStaticDefinitions(Map<ResourceLocation, StateDefinition<Block, BlockState>> map, BiConsumer<ResourceLocation, StateDefinition<Block, BlockState>> func) {
         map.forEach((loc, def) -> blockStateFiles.add(loc));
     }
 
-    @Redirect(method = "processLoading", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;", ordinal = 0))
+    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;", ordinal = 0))
     private ImmutableList<BlockState> fetchBlocks(StateDefinition<Block, BlockState> def) {
-        blockStateFiles.add(def.any().getBlock().getRegistryName());
+        blockStateFiles.add(ForgeRegistries.BLOCKS.getKey(def.any().getBlock()));
         return ImmutableList.of();
     }