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

Update to 1.21 full release

Browse Source
This commit is contained in:
embeddedt 2024-06-13 17:24:04 -04:00
parent d4cc7664f6
commit f2379dc9e3
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gradle.properties
View File

@ -5,10 +5,9 @@ junit_version=5.10.0-M1
mixinextras_version=0.3.2 mixinextras_version=0.3.2
mod_id=modernfix mod_id=modernfix
minecraft_version=1.21-pre4 minecraft_version=1.21
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
forge_version=21.0.0-alpha.1.21-pre4.20240609.000029 forge_version=21.0.0-beta
neoforge_pr=1076
# parchment_version=2023.07.09 # parchment_version=2023.07.09
refined_storage_version=4392788 refined_storage_version=4392788
jei_version=16.0.0.28 jei_version=16.0.0.28
@ -16,7 +15,7 @@ rei_version=13.0.678
ctm_version=1.20.1-1.1.8+4 ctm_version=1.20.1-1.1.8+4
kubejs_version=1902.6.0-build.142 kubejs_version=1902.6.0-build.142
rhino_version=1902.2.2-build.268 rhino_version=1902.2.2-build.268
supported_minecraft_versions=1.21-pre4 supported_minecraft_versions=1.21
fabric_loader_version=0.15.11 fabric_loader_version=0.15.11
fabric_api_version=0.100.0+1.21 fabric_api_version=0.100.0+1.21

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

@ -14,6 +14,7 @@ import net.neoforged.fml.*;
import net.neoforged.fml.common.Mod; import net.neoforged.fml.common.Mod;
import net.neoforged.fml.config.ModConfig; import net.neoforged.fml.config.ModConfig;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.loading.FMLEnvironment;
import net.neoforged.fml.loading.FMLLoader; import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.RegisterCommandsEvent; import net.neoforged.neoforge.event.RegisterCommandsEvent;
@ -41,7 +42,9 @@ public class ModernFixForge {
NeoForge.EVENT_BUS.register(this); NeoForge.EVENT_BUS.register(this);
modBus.addListener(this::commonSetup); modBus.addListener(this::commonSetup);
modBus.addListener(this::registerItems); modBus.addListener(this::registerItems);
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> NeoForge.EVENT_BUS.register(new ModernFixClientForge(modContainer, modBus))); if(FMLEnvironment.dist == Dist.CLIENT) {
NeoForge.EVENT_BUS.register(new ModernFixClientForge(modContainer, modBus));
}
modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG); modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
ModFileScanDataDeduplicator.deduplicate(); ModFileScanDataDeduplicator.deduplicate();
ClassLoadHack.loadModClasses(); ClassLoadHack.loadModClasses();

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

@ -32,10 +32,8 @@ import org.spongepowered.asm.mixin.injection.struct.InjectorGroupInfo;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks { public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {