Skip to content

Commit 2cce200

Browse files
embeddedtembeddedt
committed
Update to 1.20.5
1 parent 2e9a6f2 commit 2cce200

File tree

12 files changed

+31
-217
lines changed

12 files changed

+31
-217
lines changed

‎common/src/main/java/org/embeddedt/modernfix/packet/EntityIDSyncPacket.java‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ junit_version=5.10.0-M1
55
mixinextras_version=0.3.2
66

77
mod_id=modernfix
8-
minecraft_version=1.20.5-rc2
9-
enabled_platforms=fabric
10-
forge_version=20.4.190
8+
minecraft_version=1.20.5
9+
enabled_platforms=fabric,neoforge
10+
forge_version=20.5.0-beta
1111
# parchment_version=2023.07.09
1212
refined_storage_version=4392788
1313
jei_version=16.0.0.28
1414
rei_version=13.0.678
1515
ctm_version=1.20.1-1.1.8+4
1616
kubejs_version=1902.6.0-build.142
1717
rhino_version=1902.2.2-build.268
18-
supported_minecraft_versions=1.20.5-rc2
18+
supported_minecraft_versions=1.20.5
1919

2020
fabric_loader_version=0.15.9
2121
fabric_api_version=0.97.5+1.20.5

‎neoforge/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
processResources {
7070
inputs.property "version", project.version
7171

72-
filesMatching("META-INF/mods.toml") {
72+
filesMatching("META-INF/neoforge.mods.toml") {
7373
expand "version": project.version
7474
}
7575
}

‎neoforge/src/main/java/org/embeddedt/modernfix/neoforge/config/NightConfigFixer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.embeddedt.modernfix.neoforge.config;
22

33
import com.electronwill.nightconfig.core.file.FileWatcher;
4-
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
4+
import cpw.mods.modlauncher.api.LambdaExceptionUtils;
55
import net.neoforged.fml.loading.FMLLoader;
66
import net.neoforged.fml.util.ObfuscationReflectionHelper;
77
import org.embeddedt.modernfix.ModernFix;
@@ -51,7 +51,7 @@ public static void runReloads() {
5151
}
5252

5353
static class MonitoringMap extends ConcurrentHashMap<Path, Object> {
54-
private static final Class<?> WATCHED_FILE = LamdbaExceptionUtils.uncheck(() -> Class.forName("com.electronwill.nightconfig.core.file.FileWatcher$WatchedFile"));
54+
private static final Class<?> WATCHED_FILE = LambdaExceptionUtils.uncheck(() -> Class.forName("com.electronwill.nightconfig.core.file.FileWatcher$WatchedFile"));
5555
private static final Field CHANGE_HANDLER = ObfuscationReflectionHelper.findField(WATCHED_FILE, "changeHandler");
5656

5757
public MonitoringMap(ConcurrentHashMap<Path, ?> oldMap) {

‎neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import net.neoforged.api.distmarker.Dist;
1414
import net.neoforged.bus.api.SubscribeEvent;
1515
import net.neoforged.fml.ModLoader;
16-
import net.neoforged.fml.common.Mod;
16+
import net.neoforged.fml.common.EventBusSubscriber;
1717
import net.neoforged.fml.util.ObfuscationReflectionHelper;
1818
import net.neoforged.neoforge.client.event.ScreenEvent;
1919
import net.neoforged.neoforge.common.data.ExistingFileHelper;
@@ -27,7 +27,7 @@
2727
import java.util.concurrent.CompletableFuture;
2828
import java.util.stream.Collectors;
2929

30-
@Mod.EventBusSubscriber(value = Dist.CLIENT)
30+
@EventBusSubscriber(value = Dist.CLIENT)
3131
public class RuntimeDatagen {
3232
private static final String RESOURCES_OUT_DIR = getPropertyOrBlank("modernfix.datagen.output");
3333
private static final String RESOURCES_IN_DIR = getPropertyOrBlank("modernfix.datagen.existing");
@@ -67,7 +67,7 @@ public static void runRuntimeDatagen() {
6767
List<PackResources> oldPacks = new ArrayList<>(manager.listPacks().collect(Collectors.toList()));
6868
oldPacks.add(Minecraft.getInstance().getVanillaPackResources());
6969
ObfuscationReflectionHelper.setPrivateValue(ExistingFileHelper.class, existingFileHelper, new MultiPackResourceManager(PackType.CLIENT_RESOURCES, oldPacks), "clientResources");
70-
ModLoader.get().runEventGenerator(mc->new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
70+
ModLoader.runEventGenerator(mc->new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
7171
dataGeneratorConfig.runAll();
7272
ObfuscationReflectionHelper.setPrivateValue(DatagenModLoader.class, null, false, "runningDataGen");
7373
ModernFix.LOGGER.info("Finished runtime datagen.");

‎neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
import net.minecraft.client.gui.components.DebugScreenOverlay;
88
import net.minecraft.commands.CommandSourceStack;
99
import net.neoforged.bus.api.EventPriority;
10+
import net.neoforged.bus.api.IEventBus;
1011
import net.neoforged.bus.api.SubscribeEvent;
12+
import net.neoforged.fml.ModContainer;
1113
import net.neoforged.fml.ModLoader;
1214
import net.neoforged.fml.ModLoadingContext;
13-
import net.neoforged.fml.ModLoadingStage;
1415
import net.neoforged.fml.ModLoadingWarning;
1516
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
16-
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
17-
import net.neoforged.neoforge.client.ConfigScreenHandler;
1817
import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
1918
import net.neoforged.neoforge.client.event.RecipesUpdatedEvent;
2019
import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent;
2120
import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
21+
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
2222
import net.neoforged.neoforge.client.settings.KeyConflictContext;
2323
import net.neoforged.neoforge.event.TagsUpdatedEvent;
2424
import net.neoforged.neoforge.event.TickEvent;
@@ -34,14 +34,11 @@
3434
public class ModernFixClientForge {
3535
private static ModernFixClient commonMod;
3636

37-
public ModernFixClientForge() {
37+
public ModernFixClientForge(ModContainer modContainer, IEventBus modBus) {
3838
commonMod = new ModernFixClient();
39-
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::keyBindRegister);
40-
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup);
41-
ModLoadingContext.get().registerExtensionPoint(
42-
ConfigScreenHandler.ConfigScreenFactory.class,
43-
() -> new ConfigScreenHandler.ConfigScreenFactory((mc, screen) -> new ModernFixConfigScreen(screen))
44-
);
39+
modBus.addListener(this::keyBindRegister);
40+
modBus.addListener(this::onClientSetup);
41+
modContainer.registerExtensionPoint(IConfigScreenFactory.class, (mc, screen) -> new ModernFixConfigScreen(screen));
4542
}
4643

4744
private KeyMapping configKey;
@@ -54,7 +51,7 @@ private void keyBindRegister(RegisterKeyMappingsEvent event) {
5451
private void onClientSetup(FMLClientSetupEvent event) {
5552
if(false) {
5653
event.enqueueWork(() -> {
57-
ModLoader.get().addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), ModLoadingStage.SIDED_SETUP, "modernfix.connectedness_dynresoruces"));
54+
ModLoader.addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), "modernfix.connectedness_dynresoruces"));
5855
});
5956
}
6057
}

‎neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,25 @@
88
import net.minecraft.world.item.Item;
99
import net.neoforged.api.distmarker.Dist;
1010
import net.neoforged.bus.api.EventPriority;
11+
import net.neoforged.bus.api.IEventBus;
1112
import net.neoforged.bus.api.SubscribeEvent;
1213
import net.neoforged.fml.*;
1314
import net.neoforged.fml.common.Mod;
1415
import net.neoforged.fml.config.ModConfig;
1516
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
16-
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
1717
import net.neoforged.fml.loading.FMLLoader;
1818
import net.neoforged.neoforge.common.NeoForge;
19-
import net.neoforged.neoforge.event.OnDatapackSyncEvent;
2019
import net.neoforged.neoforge.event.RegisterCommandsEvent;
2120
import net.neoforged.neoforge.event.server.ServerStartedEvent;
2221
import net.neoforged.neoforge.event.server.ServerStoppedEvent;
2322
import net.neoforged.neoforge.registries.RegisterEvent;
24-
import net.neoforged.neoforge.server.ServerLifecycleHooks;
2523
import org.apache.commons.lang3.tuple.Pair;
2624
import org.embeddedt.modernfix.ModernFix;
2725
import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
28-
import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler;
2926
import org.embeddedt.modernfix.neoforge.ModernFixConfig;
3027
import org.embeddedt.modernfix.neoforge.classloading.ClassLoadHack;
3128
import org.embeddedt.modernfix.neoforge.classloading.ModFileScanDataDeduplicator;
3229
import org.embeddedt.modernfix.neoforge.config.NightConfigFixer;
33-
import org.embeddedt.modernfix.neoforge.packet.PacketHandler;
3430

3531
import java.util.List;
3632

@@ -39,16 +35,14 @@ public class ModernFixForge {
3935
private static ModernFix commonMod;
4036
public static boolean launchDone = false;
4137

42-
public ModernFixForge() {
38+
public ModernFixForge(ModContainer modContainer, IEventBus modBus) {
4339
commonMod = new ModernFix();
4440
// Register ourselves for server and other game events we are interested in
4541
NeoForge.EVENT_BUS.register(this);
46-
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
47-
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::registerItems);
48-
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> NeoForge.EVENT_BUS.register(new ModernFixClientForge()));
49-
ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true));
50-
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
51-
PacketHandler.register();
42+
modBus.addListener(this::commonSetup);
43+
modBus.addListener(this::registerItems);
44+
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> NeoForge.EVENT_BUS.register(new ModernFixClientForge(modContainer, modBus)));
45+
modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
5246
ModFileScanDataDeduplicator.deduplicate();
5347
ClassLoadHack.loadModClasses();
5448
//ConfigFixer.replaceConfigHandlers();
@@ -66,15 +60,6 @@ public void onCommandRegister(RegisterCommandsEvent event) {
6660
}
6761
}
6862

69-
@SubscribeEvent
70-
public void onDatapackSync(OnDatapackSyncEvent event) {
71-
if(event.getPlayer() != null) {
72-
if(!ServerLifecycleHooks.getCurrentServer().isDedicatedServer() && event.getPlayerList().getPlayerCount() == 0)
73-
return;
74-
EntityDataIDSyncHandler.onDatapackSyncEvent(event.getPlayer());
75-
}
76-
}
77-
7863
private void registerItems(RegisterEvent event) {
7964
if(Boolean.getBoolean("modernfix.largeRegistryTest")) {
8065
event.register(Registries.ITEM, helper -> {
@@ -98,11 +83,11 @@ public void commonSetup(FMLCommonSetupEvent event) {
9883
boolean isPresent = !FMLLoader.isProduction() || warning.getLeft().stream().anyMatch(name -> ModList.get().isLoaded(name));
9984
if(!isPresent) {
10085
atLeastOneWarning = true;
101-
ModLoader.get().addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), ModLoadingStage.COMMON_SETUP, warning.getRight()));
86+
ModLoader.addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), warning.getRight()));
10287
}
10388
}
10489
if(atLeastOneWarning)
105-
ModLoader.get().addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), ModLoadingStage.COMMON_SETUP, "modernfix.perf_mod_warning"));
90+
ModLoader.addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), "modernfix.perf_mod_warning"));
10691
});
10792
}
10893
}

‎neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_event_progress/GameDataMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import net.neoforged.fml.ModList;
66
import net.neoforged.fml.ModLoader;
77
import net.neoforged.fml.ModLoadingContext;
8-
import net.neoforged.fml.StartupMessageManager;
98
import net.neoforged.fml.event.IModBusEvent;
9+
import net.neoforged.fml.loading.progress.StartupNotificationManager;
1010
import net.neoforged.neoforge.registries.GameData;
1111
import net.neoforged.neoforge.registries.RegisterEvent;
1212
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
@@ -35,12 +35,12 @@ private static void closeAsyncScreen(CallbackInfo ci) {
3535
}
3636

3737
@Redirect(method = "postRegisterEvents", at = @At(value = "INVOKE", target = "Lnet/neoforged/fml/ModLoader;postEventWrapContainerInModOrder(Lnet/neoforged/bus/api/Event;)V"))
38-
private static <T extends Event & IModBusEvent> void swapThreadAndPost(ModLoader loader, T event) {
38+
private static <T extends Event & IModBusEvent> void swapThreadAndPost(T event) {
3939
RegisterEvent registryEvent = (RegisterEvent)event;
4040
// We control phases ourselves so we can make a separate progress bar for each phase.
4141
String registryName = registryEvent.getRegistryKey().location().toString();
4242
for(EventPriority phase : EventPriority.values()) {
43-
var pb = StartupMessageManager.addProgressBar(registryName, ModList.get().size());
43+
var pb = StartupNotificationManager.addProgressBar(registryName, ModList.get().size());
4444
try {
4545
ModList.get().forEachModInOrder(mc -> {
4646
ModLoadingContext.get().setActiveContainer(mc);

0 commit comments

Comments
 (0)