diff --git a/1.19.properties b/1.19.properties index 40e0fa69f..d12d0a8b2 100644 --- a/1.19.properties +++ b/1.19.properties @@ -6,8 +6,8 @@ parchment_version=2022.03.13 compatible_minecraft_versions=["1.19"] # Fabric loader -fabric_loader_version=0.14.7 -fabric_api_version=0.55.3+1.19 +fabric_loader_version=0.14.8 +fabric_api_version=0.57.0+1.19 # Fabric mod versions modmenu_version=4.0.0 starlight_version_fabric=0 @@ -30,7 +30,7 @@ fabric_api_version=0.55.3+1.19 enable_bclib=0 # Forge loader -forge_version=41.0.85 +forge_version=41.0.94 # Forge mod versions starlight_version_forge=0 terraforged_version= diff --git a/Readme.md b/Readme.md index 30c0a086a..a50121fc1 100644 --- a/Readme.md +++ b/Readme.md @@ -27,9 +27,9 @@ Architectury loom version: 0.12.0-SNAPSHOT\ Java Compiler plugin: Manifold Preprocessor #### 1.19 mods -Forge version: 41.0.10\ -Fabric version: 0.14.7\ -Fabric API version: 0.55.3+1.19\ +Forge version: 41.0.94\ +Fabric version: 0.14.8\ +Fabric API version: 0.57.0+1.19\ Modmenu version: 4.0.0 #### 1.18.2 mods diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java index 807f819af..32eea0e9b 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java @@ -35,9 +35,15 @@ import com.seibel.lod.common.wrappers.world.WorldWrapper; import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.event.TickEvent; +#if PRE_MC_1_19 import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; +#else +import net.minecraftforge.event.level.BlockEvent; +import net.minecraftforge.event.level.ChunkEvent; +import net.minecraftforge.event.level.LevelEvent; +#endif import net.minecraftforge.eventbus.api.SubscribeEvent; /** @@ -64,30 +70,55 @@ public class ForgeClientProxy @SubscribeEvent public void chunkLoadEvent(ChunkEvent.Load event) { + #if PRE_MC_1_19 clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getWorld()), WorldWrapper.getWorldWrapper(event.getWorld())); + #else + clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getLevel()), WorldWrapper.getWorldWrapper(event.getLevel())); + #endif } @SubscribeEvent + #if PRE_MC_1_19 public void worldSaveEvent(WorldEvent.Save event) + #else + public void worldSaveEvent(LevelEvent.Save event) + #endif { eventApi.worldSaveEvent(); } /** This is also called when a new dimension loads */ @SubscribeEvent + #if PRE_MC_1_19 public void worldLoadEvent(WorldEvent.Load event) + #else + public void worldLoadEvent(LevelEvent.Load event) + #endif { if (Minecraft.getInstance().screen instanceof TitleScreen) return; + #if PRE_MC_1_19 if (event.getWorld() != null) { eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld())); } + #else + if (event.getLevel() != null) { + eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getLevel())); + } + #endif } @SubscribeEvent + #if PRE_MC_1_19 public void worldUnloadEvent(WorldEvent.Unload event) { eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getWorld())); } + #else + public void worldUnloadEvent(LevelEvent.Unload event) + { + eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getLevel())); + } + #endif @SubscribeEvent public void blockChangeEvent(BlockEvent event) @@ -99,8 +130,13 @@ public class ForgeClientProxy event.getClass() == BlockEvent.FluidPlaceBlockEvent.class || event.getClass() == BlockEvent.PortalSpawnEvent.class) { + #if PRE_MC_1_19 IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()), event.getWorld()); DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType()); + #else + IChunkWrapper chunk = new ChunkWrapper(event.getLevel().getChunk(event.getPos()), event.getLevel()); + DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getLevel().dimensionType()); + #endif // recreate the LOD where the blocks were changed eventApi.blockChangeEvent(chunk, dimType); diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java index 19d10edce..f25ceac20 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -49,7 +49,9 @@ import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.ExtensionPoint; #elif MC_1_17_1 import net.minecraftforge.fmlclient.ConfigGuiHandler; -#else // 1.18+ +#elif POST_MC_1_19 +import net.minecraftforge.client.ConfigScreenHandler; +#else // 1.18+ untill 1.19 import net.minecraftforge.client.ConfigGuiHandler; #endif @@ -107,6 +109,9 @@ public class ForgeMain implements LodForgeMethodCaller #if PRE_MC_1_17_1 ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> (client, parent) -> ConfigGui.getScreen(parent, "")); + #elif POST_MC_1_19 + ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, + () -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> ConfigGui.getScreen(parent, ""))); #else ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class, () -> new ConfigGuiHandler.ConfigGuiFactory((client, parent) -> ConfigGui.getScreen(parent, "")));