Merge remote-tracking branch 'origin/1.18' into 1.19.2

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/ModernFix.java

@@ -1,5 +1,6 @@
 package org.embeddedt.modernfix;
 
+import net.minecraft.SharedConstants;
 import net.minecraft.Util;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ChunkMap;
@@ -24,6 +25,8 @@ public class ModernFix {
 
     public static final String MODID = "modernfix";
 
+    public static String NAME = "ModernFix";
+
     public static ModernFix INSTANCE;
 
     // Used to skip computing the blockstate caches twice
@@ -46,6 +49,8 @@ public static ExecutorService resourceReloadExecutor() {
 
     public ModernFix() {
         INSTANCE = this;
+        if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.snapshot_easter_egg.NameChange") && !SharedConstants.getCurrentVersion().isStable())
+            NAME = "PreemptiveFix";
         ModernFixPlatformHooks.onServerCommandRegister(ModernFixCommands::register);
         if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.spam_thread_dump.ThreadDumper")) {
             Thread t = new Thread() {

common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java

@@ -45,7 +45,7 @@ public ModernFixClient() {
         // clear reserve as it's not needed
         MemoryReserve.release();
         if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.branding.F3Screen")) {
-            brandingString = "ModernFix " + ModernFixPlatformHooks.getVersionString();
+            brandingString = ModernFix.NAME + " " + ModernFixPlatformHooks.getVersionString();
         }
         SearchTreeProviderRegistry.register(JEIBackedSearchTree.PROVIDER);
         SearchTreeProviderRegistry.register(REIBackedSearchTree.PROVIDER);

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java

@@ -3,6 +3,7 @@
 import net.minecraft.client.renderer.block.BlockModelShaper;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
@@ -37,9 +38,14 @@ private void replaceModelMap(CallbackInfo ci) {
     public void rebuildCache() {
     }
 
+    /**
+     * @author embeddedt
+     * @reason get the model from the dynamic model provider
+     */
     @Overwrite
     public BakedModel getBlockModel(BlockState state) {
-        BakedModel model = modelManager.getModel(ModelLocationCache.get(state));
+        ModelResourceLocation mrl = ModelLocationCache.get(state);
+        BakedModel model = mrl == null ? null : modelManager.getModel(mrl);
         if (model == null) {
             model = modelManager.getMissingModel();
         }

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -148,6 +148,7 @@ else if(isClientOnly && !ModernFixPlatformHooks.isClient())
             .put("mixin.feature.integrated_server_watchdog", true)
             .put("mixin.perf.faster_item_rendering", false)
             .put("mixin.feature.spam_thread_dump", false)
+            .put("mixin.feature.snapshot_easter_egg", true)
             .put("mixin.devenv", isDevEnv)
             .put("mixin.perf.remove_spawn_chunks", isDevEnv)
             .build();

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

@@ -31,6 +31,8 @@ public ModelResourceLocation load(Item key) throws Exception {
             });
 
     public static ModelResourceLocation get(BlockState state) {
+        if(state == null)
+            return null;
         try {
             return blockLocationCache.get(state);
         } catch(ExecutionException e) {
@@ -39,6 +41,8 @@ public static ModelResourceLocation get(BlockState state) {
     }
 
     public static ModelResourceLocation get(Item item) {
+        if(item == null)
+            return null;
         try {
             return itemLocationCache.get(item);
         } catch(ExecutionException e) {

fabric/src/main/resources/fabric.mod.json

@@ -34,7 +34,7 @@
     "fabric-screen-api-v1": "*",
     "fabric-command-api-v2": "*",
     "fabric-models-v0": "*",
-    "minecraft": ">=1.16.5"
+    "minecraft": ">=1.16.2"
   },
   "breaks": {
     "dashloader": "*"