From 304fd059556bc3596fbf180d3e0b5ea96b9ed061 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 26 Mar 2023 19:30:10 -0400 Subject: [PATCH] Clean up log messages --- .../core/config/ModernFixEarlyConfig.java | 17 +++++++++++------ .../PiglinBarteringRecipeBuilderMixin.java | 2 +- .../{ => jeresources}/LootTableHelperMixin.java | 2 +- src/main/resources/modernfix.mixins.json | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) rename src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/{ => jepb}/PiglinBarteringRecipeBuilderMixin.java (99%) rename src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/{ => jeresources}/LootTableHelperMixin.java (98%) diff --git a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index e8ece824..0184c476 100644 --- a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -14,6 +14,10 @@ public class ModernFixEarlyConfig { private final Map options = new HashMap<>(); + private static boolean modPresent(String modId) { + return FMLLoader.getLoadingModList().getModFileById(modId) != null; + } + private ModernFixEarlyConfig() { // Defines the default rules which can be configured by the user or other mods. // You must manually add a rule for any new mixins not covered by an existing package rule. @@ -23,8 +27,9 @@ public class ModernFixEarlyConfig { this.addMixinRule("feature.reduce_loading_screen_freezes", false); this.addMixinRule("feature.direct_stack_trace", false); this.addMixinRule("perf.fast_registry_validation", true); - this.addMixinRule("perf.use_integrated_resources", true); - this.addMixinRule("perf.jeresources_startup", true); + this.addMixinRule("perf.use_integrated_resources.jepb", modPresent("jepb")); + this.addMixinRule("perf.use_integrated_resources.jeresources", modPresent("jeresources")); + this.addMixinRule("perf.jeresources_startup", modPresent("jeresources")); this.addMixinRule("perf.remove_biome_temperature_cache", true); this.addMixinRule("perf.resourcepacks", true); this.addMixinRule("perf.reduce_blockstate_cache_rebuilds", true); @@ -40,8 +45,8 @@ public class ModernFixEarlyConfig { this.addMixinRule("bugfix.packet_leak", false); this.addMixinRule("bugfix.structure_manager_crash", true); this.addMixinRule("bugfix.mc218112", true); - this.addMixinRule("bugfix.tf_cme_on_load", true); - this.addMixinRule("perf.async_jei", true); + this.addMixinRule("bugfix.tf_cme_on_load", modPresent("twilightforest")); + this.addMixinRule("perf.async_jei", modPresent("jei")); this.addMixinRule("perf.thread_priorities", true); this.addMixinRule("perf.preload_block_classes", false); this.addMixinRule("perf.sync_executor_sleep", true); @@ -56,10 +61,10 @@ public class ModernFixEarlyConfig { this.addMixinRule("perf.datapack_reload_exceptions", true); this.addMixinRule("perf.async_locator", true); this.addMixinRule("perf.faster_texture_stitching", true); - this.addMixinRule("perf.kubejs", true); + this.addMixinRule("perf.kubejs", modPresent("kubejs")); this.addMixinRule("perf.faster_singleplayer_load", false); /* Keep this off if JEI isn't installed to prevent breaking vanilla gameplay */ - this.addMixinRule("perf.blast_search_trees", FMLLoader.getLoadingModList().getModFileById("jei") != null); + this.addMixinRule("perf.blast_search_trees", modPresent("jei")); this.addMixinRule("safety", true); this.addMixinRule("launch.transformer_cache", false); this.addMixinRule("launch.class_search_cache", true); diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/PiglinBarteringRecipeBuilderMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java similarity index 99% rename from src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/PiglinBarteringRecipeBuilderMixin.java rename to src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java index a333fa7e..8370282e 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/PiglinBarteringRecipeBuilderMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.use_integrated_resources; +package org.embeddedt.modernfix.mixin.perf.use_integrated_resources.jepb; import com.thenatekirby.jepb.plugin.PiglinBarteringRecipeBuilder; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/LootTableHelperMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java similarity index 98% rename from src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/LootTableHelperMixin.java rename to src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java index ddfaf64b..538426ab 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/LootTableHelperMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.use_integrated_resources; +package org.embeddedt.modernfix.mixin.perf.use_integrated_resources.jeresources; import jeresources.util.LootTableHelper; import net.minecraft.server.MinecraftServer; diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json index a6f0380a..6c71335f 100644 --- a/src/main/resources/modernfix.mixins.json +++ b/src/main/resources/modernfix.mixins.json @@ -97,8 +97,8 @@ "bugfix.packet_leak.SCustomPayloadPlayPacketMixin", "perf.reuse_datapacks.MinecraftMixin", "perf.reuse_datapacks.MinecraftServerMixin", - "perf.use_integrated_resources.LootTableHelperMixin", - "perf.use_integrated_resources.PiglinBarteringRecipeBuilderMixin", + "perf.use_integrated_resources.jeresources.LootTableHelperMixin", + "perf.use_integrated_resources.jepb.PiglinBarteringRecipeBuilderMixin", "perf.jeresources_startup.VillagerEntryMixin", "bugfix.mc218112.SynchedEntityDataMixin_Client", "perf.faster_singleplayer_load.MinecraftServerMixin",