Runs, dynamic resources still broken

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/BlockStateBaseMixin.java

@@ -17,7 +17,7 @@ private Executor getReloadExecutorService(Executor e) {
         return ModernFix.resourceReloadExecutor();
     }
 
-    @ModifyArg(method = "openFresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/WorldLoader;load(Lnet/minecraft/server/WorldLoader$InitConfig;Lnet/minecraft/server/WorldLoader$WorldDataSupplier;Lnet/minecraft/server/WorldLoader$ResultFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), index = 3)
+    @ModifyArg(method = "openCreateWorldScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/WorldLoader;load(Lnet/minecraft/server/WorldLoader$InitConfig;Lnet/minecraft/server/WorldLoader$WorldDataSupplier;Lnet/minecraft/server/WorldLoader$ResultFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), index = 3)
     private static Executor getCreationExecutorService(Executor e) {
         return ModernFix.resourceReloadExecutor();
     }

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/MultipartMixin.java

@@ -10,7 +10,7 @@
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
-    @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/ReloadableServerResources;loadResources(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), index = 5)
+    @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/ReloadableServerResources;loadResources(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Ljava/util/List;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), index = 6)
     private Executor getReloadExecutor(Executor asyncExecutor) {
         return ModernFix.resourceReloadExecutor();
     }

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/CreateWorldScreenMixin.java

@@ -1,9 +1,6 @@
 package org.embeddedt.modernfix.common.mixin.perf.mojang_registry_size;
 
-import com.google.common.collect.ArrayTable;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.ImmutableTable;
-import com.google.common.collect.Table;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
 import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import org.embeddedt.modernfix.annotation.RequiresMod;
@@ -13,19 +10,24 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Map;
+
 /**
  * Minor mixin to avoid duplicate empty neighbor tables, used when FerriteCore is not present. Won't be enabled in 99% of
  * modded environments but is useful for testing in dev without dragging in Fabric API.
  */
 @Mixin(StateHolder.class)
 @RequiresMod("!ferritecore")
 public class StateHolderMixin {
-    @Shadow private Table<Property<?>, Comparable<?>, ?> neighbours;
+    private static final Reference2ObjectArrayMap<Property<?>, ?> EMPTY_NEIGHBOURS = new Reference2ObjectArrayMap<>();
+
+    @Shadow private Map<Property<?>, ?> neighbours;
 
     /* optimize the case where block has no properties */
     @Inject(method = "populateNeighbours", at = @At("RETURN"), require = 0)
     private void replaceEmptyTable(CallbackInfo ci) {
-        if((this.neighbours instanceof ArrayTable || this.neighbours instanceof HashBasedTable) && this.neighbours.isEmpty())
-            this.neighbours = ImmutableTable.of();
+        if (this.neighbours.isEmpty()) {
+            this.neighbours = EMPTY_NEIGHBOURS;
+        }
     }
 }

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java

@@ -9,7 +9,7 @@
 /* Idea from Lithium for 1.19.3 */
 @Mixin(Biome.class)
 public abstract class BiomeMixin {
-    @Shadow protected abstract float getHeightAdjustedTemperature(BlockPos pos);
+    @Shadow protected abstract float getHeightAdjustedTemperature(BlockPos pos, int i);
 
     /**
      * @author 2No2Name
@@ -18,7 +18,7 @@ public abstract class BiomeMixin {
      * @return
      */
     @Overwrite
-    private float getTemperature(BlockPos pos) {
-        return this.getHeightAdjustedTemperature(pos);
+    private float getTemperature(BlockPos pos, int i) {
+        return this.getHeightAdjustedTemperature(pos, i);
     }
 }