Enable NeoForge project

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/api/entrypoint/ModernFixClientIntegration.java

@@ -1,12 +1,5 @@
 package org.embeddedt.modernfix.api.entrypoint;
 
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.model.*;
-import net.minecraft.resources.ResourceLocation;
-
-import java.util.function.Function;
-
-
 /**
  * Implement this interface in a mod class and add it to "modernfix:integration_v1" in your mod metadata file
  * to integrate with ModernFix's features.
@@ -20,58 +13,4 @@ public interface ModernFixClientIntegration {
      */
     default void onDynamicResourcesStatusChange(boolean enabled) {
     }
-
-    /**
-     * Called to allow mods to observe the loading of an unbaked model and either make changes to it or wrap it with their
-     * own instance.
-     * @param location the ResourceLocation of the model (this may be a ModelResourceLocation)
-     * @param originalModel the original model
-     * @param bakery the model bakery - do not touch internal fields as they probably don't behave the way you expect
-     * with dynamic resources on
-     * @return the model which should actually be loaded for this resource location
-     */
-    default UnbakedModel onUnbakedModelLoad(ResourceLocation location, UnbakedModel originalModel, ModelBakery bakery) {
-        return originalModel;
-    }
-
-    /**
-     * Called to allow mods to observe the use of an unbaked model at bake time and either make changes to it or wrap it with their
-     * own instance.
-     * @param location the ResourceLocation of the model (this may be a ModelResourceLocation)
-     * @param originalModel the original model
-     * @param bakery the model bakery - do not touch internal fields as they probably don't behave the way you expect
-     * with dynamic resources on
-     * @return the model which should actually be loaded for this resource location
-     */
-    default UnbakedModel onUnbakedModelPreBake(ResourceLocation location, UnbakedModel originalModel, ModelBakery bakery) {
-        return originalModel;
-    }
-
-    /**
-     * Called to allow mods to observe the loading of a baked model and either make changes to it or wrap it with their
-     * own instance.
-     * @param location the ResourceLocation of the model (this may be a ModelResourceLocation)
-     * @param originalModel the original model
-     * @param bakery the model bakery - do not touch internal fields as they probably don't behave the way you expect
-     * with dynamic resources on
-     * @return the model which should actually be loaded for this resource location
-     */
-    @Deprecated
-    default BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseModel, BakedModel originalModel, ModelState state, ModelBakery bakery) {
-        return originalModel;
-    }
-
-    /**
-     * Called to allow mods to observe the loading of a baked model and either make changes to it or wrap it with their
-     * own instance.
-     * @param location the ResourceLocation of the model (this may be a ModelResourceLocation)
-     * @param originalModel the original model
-     * @param bakery the model bakery - do not touch internal fields as they probably don't behave the way you expect
-     * with dynamic resources on
-     * @param textureGetter function to retrieve textures for this model
-     * @return the model which should actually be loaded for this resource location
-     */
-    default BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseModel, BakedModel originalModel, ModelState state, ModelBakery bakery, Function<Material, TextureAtlasSprite> textureGetter) {
-        return onBakedModelLoad(location, baseModel, originalModel, state, bakery);
-    }
 }

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/SessionSearchTreesMixin.java

@@ -13,6 +13,7 @@
 import org.embeddedt.modernfix.searchtree.SearchTreeProviderRegistry;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWErrorCallback;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -28,6 +29,8 @@
 public abstract class SessionSearchTreesMixin {
     @Shadow private CompletableFuture<SearchTree<RecipeCollection>> recipeSearch;
     @Shadow private CompletableFuture<SearchTree<ItemStack>> creativeByNameSearch;
+    @Shadow @Final private static SessionSearchTrees.Key CREATIVE_NAMES;
+    @Shadow @Final private static SessionSearchTrees.Key CREATIVE_TAGS;
     private SearchTreeProviderRegistry.Provider mfix$provider;
 
     @Inject(method = "<init>", at = @At("RETURN"))
@@ -63,11 +66,12 @@ private Runnable useModernFixRecipeTree(Runnable r, @Local(ordinal = 0, argsOnly
         }
     }
 
-    @ModifyArg(method = "updateCreativeTooltips", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/SessionSearchTrees;register(Lnet/minecraft/client/multiplayer/SessionSearchTrees$Key;Ljava/lang/Runnable;)V"), index = 1)
-    private Runnable useSearchModItems(Runnable r) {
+    @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/SessionSearchTrees;register(Lnet/minecraft/client/multiplayer/SessionSearchTrees$Key;Ljava/lang/Runnable;)V"), index = 1)
+    private Runnable useOverridenSearchTreeLogic(SessionSearchTrees.Key key, Runnable r) {
         if(mfix$provider == null) {
             return r;
-        } else {
+        }
+        if(key == CREATIVE_NAMES) {
             return () -> {
                 CompletableFuture<?> old = this.creativeByNameSearch;
                 this.creativeByNameSearch = CompletableFuture.supplyAsync(() -> {
@@ -76,13 +80,7 @@ private Runnable useSearchModItems(Runnable r) {
                 old.cancel(true);
             };
         }
-    }
-
-    @ModifyArg(method = "updateCreativeTags", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/SessionSearchTrees;register(Lnet/minecraft/client/multiplayer/SessionSearchTrees$Key;Ljava/lang/Runnable;)V"), index = 1)
-    private Runnable useSearchModTags(Runnable r) {
-        if(mfix$provider == null) {
-            return r;
-        } else {
+        if(key == CREATIVE_TAGS) {
             return () -> {
                 CompletableFuture<?> old = this.creativeByNameSearch;
                 this.creativeByNameSearch = CompletableFuture.supplyAsync(() -> {
@@ -91,5 +89,6 @@ private Runnable useSearchModTags(Runnable r) {
                 old.cancel(true);
             };
         }
+        return r;
     }
 }

common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java

@@ -2,17 +2,13 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.client.resources.model.*;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
-import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
 
 import java.util.*;
-import java.util.function.BiFunction;
 
 public class ModelBakeryHelpers {
     /**
@@ -108,13 +104,4 @@ public static ImmutableList<BlockState> getBlockStatesForMRL(StateDefinition<Blo
         }
         return ImmutableList.copyOf(finalList);
     }
-
-    public static ModernFixClientIntegration bakedModelWrapper(BiFunction<ResourceLocation, Pair<UnbakedModel, BakedModel>, BakedModel> consumer) {
-        return new ModernFixClientIntegration() {
-            @Override
-            public BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseModel, BakedModel originalModel, ModelState state, ModelBakery bakery) {
-                return consumer.apply(location, Pair.of(baseModel, originalModel));
-            }
-        };
-    }
 }

common/src/main/resources/modernfix.accesswidener

@@ -38,4 +38,5 @@ accessible field net/minecraft/client/renderer/block/model/multipart/MultiPart d
 accessible field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
 mutable field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
 accessible field net/minecraft/client/renderer/entity/EnderDragonRenderer$DragonModel entity Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;
-accessible method net/minecraft/world/level/block/state/StateDefinition appendPropertyCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/world/level/block/state/properties/Property;)Lcom/mojang/serialization/MapCodec;
+accessible method net/minecraft/world/level/block/state/StateDefinition appendPropertyCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/world/level/block/state/properties/Property;)Lcom/mojang/serialization/MapCodec;
+accessible class net/minecraft/client/multiplayer/SessionSearchTrees$Key

gradle.properties

@@ -5,17 +5,18 @@ junit_version=5.10.0-M1
 mixinextras_version=0.3.2
 
 mod_id=modernfix
-minecraft_version=1.21-pre3
-enabled_platforms=fabric
-forge_version=20.6.100-beta
+minecraft_version=1.21-pre4
+enabled_platforms=fabric,neoforge
+forge_version=21.0.0-alpha.1.21-pre4.20240609.000029
+neoforge_pr=1076
 # parchment_version=2023.07.09
 refined_storage_version=4392788
 jei_version=16.0.0.28
 rei_version=13.0.678
 ctm_version=1.20.1-1.1.8+4
 kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
-supported_minecraft_versions=1.21-pre3
+supported_minecraft_versions=1.21-pre4
 
 fabric_loader_version=0.15.11
 fabric_api_version=0.100.0+1.21

neoforge/build.gradle

@@ -31,6 +31,15 @@ repositories {
         }
     }
     maven { url "https://maven.neoforged.net" }
+    if(rootProject.hasProperty("neoforge_pr")) {
+        maven {
+            url 'https://prmaven.neoforged.net/NeoForge/pr' + rootProject.neoforge_pr
+            content {
+                includeModule('net.neoforged', 'neoforge')
+                includeModule('net.neoforged', 'testframework')
+            }
+        }
+    }
 }
 
 dependencies {

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java

@@ -32,7 +32,7 @@ public class ModernFixConfig {
 
     public static Set<ResourceLocation> getJeiPluginBlacklist() {
         if(jeiPluginBlacklist == null) {
-            jeiPluginBlacklist = BLACKLIST_ASYNC_JEI_PLUGINS.get().stream().map(ResourceLocation::new).collect(Collectors.toSet());
+            jeiPluginBlacklist = BLACKLIST_ASYNC_JEI_PLUGINS.get().stream().map(ResourceLocation::parse).collect(Collectors.toSet());
         }
         return jeiPluginBlacklist;
     }

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java

@@ -34,10 +34,10 @@ public class ModelBakeEventHelper {
             "vampirism",
             "elevatorid",
             "embers");
-    private final Map<ResourceLocation, BakedModel> modelRegistry;
-    private final Set<ResourceLocation> topLevelModelLocations;
+    private final Map<ModelResourceLocation, BakedModel> modelRegistry;
+    private final Set<ModelResourceLocation> topLevelModelLocations;
     private final MutableGraph<String> dependencyGraph;
-    public ModelBakeEventHelper(Map<ResourceLocation, BakedModel> modelRegistry) {
+    public ModelBakeEventHelper(Map<ModelResourceLocation, BakedModel> modelRegistry) {
         this.modelRegistry = modelRegistry;
         this.topLevelModelLocations = new HashSet<>(modelRegistry.keySet());
         // Skip going through ModelLocationCache because most of the accesses will be misses
@@ -74,10 +74,10 @@ public ModelBakeEventHelper(Map<ResourceLocation, BakedModel> modelRegistry) {
      * @param modId the mod that the event is being fired for
      * @return a wrapper around the model registry
      */
-    private Map<ResourceLocation, BakedModel> createWarningRegistry(String modId) {
-        return new ForwardingInclDefaultsMap<ResourceLocation, BakedModel>() {
+    private Map<ModelResourceLocation, BakedModel> createWarningRegistry(String modId) {
+        return new ForwardingInclDefaultsMap<ModelResourceLocation, BakedModel>() {
             @Override
-            protected Map<ResourceLocation, BakedModel> delegate() {
+            protected Map<ModelResourceLocation, BakedModel> delegate() {
                 return modelRegistry;
             }
 
@@ -89,13 +89,13 @@ private void logWarning() {
             }
 
             @Override
-            public Set<ResourceLocation> keySet() {
+            public Set<ModelResourceLocation> keySet() {
                 logWarning();
                 return super.keySet();
             }
 
             @Override
-            public Set<Entry<ResourceLocation, BakedModel>> entrySet() {
+            public Set<Entry<ModelResourceLocation, BakedModel>> entrySet() {
                 logWarning();
                 return super.entrySet();
             }
@@ -107,14 +107,14 @@ public Collection<BakedModel> values() {
             }
 
             @Override
-            public void replaceAll(BiFunction<? super ResourceLocation, ? super BakedModel, ? extends BakedModel> function) {
+            public void replaceAll(BiFunction<? super ModelResourceLocation, ? super BakedModel, ? extends BakedModel> function) {
                 logWarning();
                 super.replaceAll(function);
             }
         };
     }
 
-    public Map<ResourceLocation, BakedModel> wrapRegistry(String modId) {
+    public Map<ModelResourceLocation, BakedModel> wrapRegistry(String modId) {
         final Set<String> modIdsToInclude = new HashSet<>();
         modIdsToInclude.add(modId);
         try {
@@ -123,11 +123,11 @@ public Map<ResourceLocation, BakedModel> wrapRegistry(String modId) {
         modIdsToInclude.remove("minecraft");
         if(modIdsToInclude.stream().noneMatch(INCOMPATIBLE_MODS::contains))
             return createWarningRegistry(modId);
-        Set<ResourceLocation> ourModelLocations = Sets.filter(this.topLevelModelLocations, loc -> modIdsToInclude.contains(loc.getNamespace()));
+        Set<ModelResourceLocation> ourModelLocations = Sets.filter(this.topLevelModelLocations, loc -> modIdsToInclude.contains(loc.id().getNamespace()));
         BakedModel missingModel = modelRegistry.get(ModelBakery.MISSING_MODEL_LOCATION);
-        return new ForwardingMap<ResourceLocation, BakedModel>() {
+        return new ForwardingMap<ModelResourceLocation, BakedModel>() {
             @Override
-            protected Map<ResourceLocation, BakedModel> delegate() {
+            protected Map<ModelResourceLocation, BakedModel> delegate() {
                 return modelRegistry;
             }
 
@@ -142,7 +142,7 @@ public BakedModel get(@Nullable Object key) {
             }
 
             @Override
-            public Set<ResourceLocation> keySet() {
+            public Set<ModelResourceLocation> keySet() {
                 return ourModelLocations;
             }
 
@@ -152,10 +152,10 @@ public boolean containsKey(@Nullable Object key) {
             }
 
             @Override
-            public void replaceAll(BiFunction<? super ResourceLocation, ? super BakedModel, ? extends BakedModel> function) {
+            public void replaceAll(BiFunction<? super ModelResourceLocation, ? super BakedModel, ? extends BakedModel> function) {
                 ModernFix.LOGGER.warn("Mod '{}' is calling replaceAll on the model registry. Some hacks will be used to keep this fast, but they may not be 100% compatible.", modId);
-                List<ResourceLocation> locations = new ArrayList<>(keySet());
-                for(ResourceLocation location : locations) {
+                List<ModelResourceLocation> locations = new ArrayList<>(keySet());
+                for(ModelResourceLocation location : locations) {
                     /*
                      * Fetching every model is insanely slow. So we call the function with a null object first, since it
                      * probably isn't expecting that. If we get an exception thrown, or it returns nonnull, then we know

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java

@@ -65,7 +65,7 @@ private void registerItems(RegisterEvent event) {
             event.register(Registries.ITEM, helper -> {
                 Item.Properties props = new Item.Properties();
                 for(int i = 0; i < 1000000; i++) {
-                    helper.register(new ResourceLocation("modernfix", "item_" + i), new Item(props));
+                    helper.register(ResourceLocation.fromNamespaceAndPath("modernfix", "item_" + i), new Item(props));
                 }
             });
         }