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

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-07-23 18:33:26 -04:00
commit bbcc58f103
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java
View File

@ -41,6 +41,8 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
if (option.isUserDefined()) { if (option.isUserDefined()) {
source = "user configuration"; source = "user configuration";
} else if (!ModernFixPlatformHooks.isLoadingNormally()) {
source = "load error";
} else if (option.isModDefined()) { } else if (option.isModDefined()) {
source = "mods [" + String.join(", ", option.getDefiningMods()) + "]"; source = "mods [" + String.join(", ", option.getDefiningMods()) + "]";
} }

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

@ -242,7 +242,7 @@ public class ModernFixEarlyConfig {
private void disableIfModPresent(String configName, String... ids) { private void disableIfModPresent(String configName, String... ids) {
for(String id : ids) { for(String id : ids) {
if(modPresent(id)) { if(!ModernFixPlatformHooks.isLoadingNormally() || modPresent(id)) {
Option option = this.options.get(configName); Option option = this.options.get(configName);
if(option != null) if(option != null)
option.addModOverride(false, id); option.addModOverride(false, id);

3
common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
View File

@ -26,6 +26,7 @@ import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.block.state.properties.Property;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration; import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -115,6 +116,8 @@ public class ModelBakeryHelpers {
Set<ResourceLocation> modelFiles, UnbakedModel missingModel, Set<ResourceLocation> modelFiles, UnbakedModel missingModel,
Function<JsonElement, BlockModel> modelDeserializer, Function<JsonElement, BlockModel> modelDeserializer,
Function<ResourceLocation, UnbakedModel> bakeryModelGetter) { Function<ResourceLocation, UnbakedModel> bakeryModelGetter) {
if(!ModernFixPlatformHooks.isLoadingNormally())
return;
Stopwatch stopwatch = Stopwatch.createStarted(); Stopwatch stopwatch = Stopwatch.createStarted();
final Object2IntOpenHashMap<String> blockstateErrors = new Object2IntOpenHashMap<>(); final Object2IntOpenHashMap<String> blockstateErrors = new Object2IntOpenHashMap<>();
/* /*

2
forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
View File

@ -73,6 +73,8 @@ public class ModernFixPlatformHooksImpl {
} }
public static boolean isLoadingNormally() { public static boolean isLoadingNormally() {
if(!LoadingModList.get().getErrors().isEmpty())
return false;
return ModLoader.isLoadingStateValid(); return ModLoader.isLoadingStateValid();
} }