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

Update NeoForge

Browse Source
This commit is contained in:
embeddedt 2024-05-07 10:39:38 -04:00
parent bebf3ccec2
commit f13910a6ed
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,6 +1,6 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.6.396" apply false
id "maven-publish"
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.palantir.git-version' version '1.0.0'

2
gradle.properties
View File

@ -7,7 +7,7 @@ mixinextras_version=0.3.2
mod_id=modernfix
minecraft_version=1.20.6
enabled_platforms=fabric,neoforge
forge_version=20.6.1-beta
forge_version=20.6.42-beta
# parchment_version=2023.07.09
refined_storage_version=4392788
jei_version=16.0.0.28

5
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java
View File

@ -11,8 +11,7 @@ import net.neoforged.bus.api.IEventBus;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.ModContainer;
import net.neoforged.fml.ModLoader;
import net.neoforged.fml.ModLoadingContext;
import net.neoforged.fml.ModLoadingWarning;
import net.neoforged.fml.ModLoadingIssue;
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
import net.neoforged.neoforge.client.event.ClientTickEvent;
import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
@ -52,7 +51,7 @@ public class ModernFixClientForge {
private void onClientSetup(FMLClientSetupEvent event) {
if(false) {
event.enqueueWork(() -> {
ModLoader.addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), "modernfix.connectedness_dynresoruces"));
ModLoader.addLoadingIssue(ModLoadingIssue.warning("modernfix.connectedness_dynresoruces"));
});
}
}

4
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
View File

@ -83,11 +83,11 @@ public class ModernFixForge {
boolean isPresent = !FMLLoader.isProduction() || warning.getLeft().stream().anyMatch(name -> ModList.get().isLoaded(name));
if(!isPresent) {
atLeastOneWarning = true;
ModLoader.addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), warning.getRight()));
ModLoader.addLoadingIssue(ModLoadingIssue.warning(warning.getRight()));
}
}
if(atLeastOneWarning)
ModLoader.addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), "modernfix.perf_mod_warning"));
ModLoader.addLoadingIssue(ModLoadingIssue.warning("modernfix.perf_mod_warning"));
});
}
}

2
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java
View File

@ -27,7 +27,7 @@ public class ForgeHooksClientMixin {
*/
@Redirect(method = "onModifyBakingResult", at = @At(value = "INVOKE", target = "Lnet/neoforged/fml/ModLoader;postEvent(Lnet/neoforged/bus/api/Event;)V"), remap = false)
private static void postNamespacedKeySetEvent(Event event) {
if(!ModLoader.isLoadingStateValid())
if(ModLoader.hasErrors())
return;
ModelEvent.ModifyBakingResult bakeEvent = ((ModelEvent.ModifyBakingResult)event);
ModelBakeEventHelper helper = new ModelBakeEventHelper(bakeEvent.getModels());

4
neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
View File

@ -71,11 +71,11 @@ public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {
}
public boolean isEarlyLoadingNormally() {
return LoadingModList.get().getErrors().isEmpty();
return !LoadingModList.get().hasErrors();
}
public boolean isLoadingNormally() {
return isEarlyLoadingNormally() && ModLoader.isLoadingStateValid();
return isEarlyLoadingNormally() && !ModLoader.hasErrors();
}
public Path getGameDirectory() {

2
neoforge/src/main/resources/META-INF/neoforge.mods.toml
View File

@ -47,7 +47,7 @@ modId = "neoforge" #mandatory
# Does this dependency have to exist - if not, ordering below must be specified
type = "required" #mandatory
# The version range of the dependency
versionRange = "[20.5.0-beta,)" #mandatory
versionRange = "[20.6.42-beta,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering = "NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER