R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
embeddedt 2023-05-16 11:01:46 -04:00
commit 3a24d094c9
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java
View File

@ -3,6 +3,7 @@ package org.embeddedt.modernfix.searchtree;
import net.minecraft.client.searchtree.RefreshableSearchTree; import net.minecraft.client.searchtree.RefreshableSearchTree;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.embeddedt.modernfix.core.ModernFixMixinPlugin; import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
import org.embeddedt.modernfix.core.config.Option;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -15,7 +16,8 @@ public class SearchTreeProviderRegistry {
if(p.canUse()) if(p.canUse())
return p; return p;
} }
if(ModernFixMixinPlugin.instance.config.getEffectiveOptionForMixin("mixin.perf.blast_search_trees.Registry").isOverridden()) Option option = ModernFixMixinPlugin.instance.config.getEffectiveOptionForMixin("perf.blast_search_trees.Registry");
if(option != null && option.isOverridden())
return DummySearchTree.PROVIDER; return DummySearchTree.PROVIDER;
else else
return null; return null;

5
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java
View File

@ -28,9 +28,6 @@ public class BootstrapMixin {
/* for https://github.com/MinecraftForge/MinecraftForge/issues/9505 */ /* for https://github.com/MinecraftForge/MinecraftForge/issues/9505 */
@Inject(method = "bootStrap", at = @At("RETURN")) @Inject(method = "bootStrap", at = @At("RETURN"))
private static void doClassloadHack(CallbackInfo ci) { private static void doClassloadHack(CallbackInfo ci) {
if(!isBootstrapped) { NetworkConstants.init();
NetworkConstants.init();
LOGGER.info("Worked around Forge issue #9505");
}
} }
} }