diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java index 13a2183ab..c0450685a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java @@ -80,9 +80,11 @@ public class FabricMain if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("optifine")) { ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor()); } + #if POST_MC_1_17_1 if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib")) { ModAccessorInjector.INSTANCE.bind(IBCLibAccessor.class, new BCLibAccessor()); } + #endif LOGGER.info(ModInfo.READABLE_NAME + " Initialized"); ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null); diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java index af870a21c..ae8014e5f 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java @@ -1,5 +1,6 @@ package com.seibel.lod.fabric.wrappers.modAccessor; +#if POST_MC_1_17_1 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor; import ru.bclib.config.ClientConfig; import ru.bclib.config.Configs; @@ -18,4 +19,5 @@ public class BCLibAccessor implements IBCLibAccessor { // This disabled fog from rendering within bclib Configs.CLIENT_CONFIG.set(ClientConfig.CUSTOM_FOG_RENDERING, newValue); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties index bee63b146..946897212 100644 --- a/versionProperties/1.16.5.properties +++ b/versionProperties/1.16.5.properties @@ -16,8 +16,9 @@ fabric_api_version=0.42.0+1.16 lithium_version=mc1.16.5-0.6.6 sodium_version=mc1.16.5-0.2.0 iris_version=1.16.x-v1.2.5 - bclib_version= + bclib_version=0.1.41 immersive_portals_version= + canvas_version= # Fabric mod run # 0 = Don't enable and don't run diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties index 665eaec82..ddc76d7b7 100644 --- a/versionProperties/1.17.1.properties +++ b/versionProperties/1.17.1.properties @@ -16,7 +16,7 @@ fabric_api_version=0.46.1+1.17 lithium_version= sodium_version=mc1.17.1-0.3.4 iris_version=1.17.x-v1.2.7 - bclib_version= + bclib_version=0.5.6 immersive_portals_version= canvas_version= @@ -29,7 +29,7 @@ fabric_api_version=0.46.1+1.17 enable_lithium=0 enable_sodium=1 enable_iris=0 - enable_bclib=0 + enable_bclib=1 enable_immersive_portals=0 enable_canvas=0 diff --git a/versionProperties/1.18.1.properties b/versionProperties/1.18.1.properties index c2f79ff96..ad70e49b4 100644 --- a/versionProperties/1.18.1.properties +++ b/versionProperties/1.18.1.properties @@ -1,44 +1,50 @@ +# @Depricated +# Support will be removed soon + # 1.18.1 version -java_version = 17 -minecraft_version=1.18.1 -parchment_version=2022.03.06 -compatible_minecraft_versions=["1.18", "1.18.1"] -accessWidenerVersion=1_18 -builds_for=fabric,forge -# Fabric loader -fabric_loader_version=0.13.3 -fabric_api_version=0.46.6+1.18 - # Fabric mod versions - modmenu_version=3.0.1 - starlight_version_fabric=3554912 - phosphor_version_fabric=3573395 - lithium_version=mc1.18.1-0.7.7 - sodium_version=mc1.18.1-0.4.0-alpha6 - iris_version=1.18.x-v1.2.5 - bclib_version=1.2.5 - immersive_portals_version=v1.0.4-1.18 - # Fabric mod run - # 0 = Don't enable and don't run - # 1 = Can be referenced in code but doesn't run - # 2 = Can be referenced in code and runs in client - enable_starlight=0 - enable_phosphor=0 - enable_sodium=1 - enable_lithium=0 - enable_iris=0 - enable_bclib=0 -# Forge loader -forge_version=39.1.2 - # Forge mod versions - starlight_version_forge=3559934 - terraforged_version= - - # Forge mod run - # 0 = Don't enable and don't run - # 1 = Can be referenced in code but doesn't run - # 2 = Can be referenced in code and runs in client - enable_starlight_forge=0 - enable_terraforged=0 +#java_version = 17 +#minecraft_version=1.18.1 +#parchment_version=2022.03.06 +#compatible_minecraft_versions=["1.18", "1.18.1"] +#accessWidenerVersion=1_18 +#builds_for=fabric,forge +# +## Fabric loader +#fabric_loader_version=0.13.3 +#fabric_api_version=0.46.6+1.18 +# # Fabric mod versions +# modmenu_version=3.0.1 +# starlight_version_fabric=3554912 +# phosphor_version_fabric=3573395 +# lithium_version=mc1.18.1-0.7.7 +# sodium_version=mc1.18.1-0.4.0-alpha6 +# iris_version=1.18.x-v1.2.5 +# bclib_version=1.2.5 +# immersive_portals_version=v1.0.4-1.18 +# +# # Fabric mod run +# # 0 = Don't enable and don't run +# # 1 = Can be referenced in code but doesn't run +# # 2 = Can be referenced in code and runs in client +# enable_starlight=0 +# enable_phosphor=0 +# enable_sodium=1 +# enable_lithium=0 +# enable_iris=0 +# enable_bclib=0 +# +## Forge loader +#forge_version=39.1.2 +# # Forge mod versions +# starlight_version_forge=3559934 +# terraforged_version= +# +# # Forge mod run +# # 0 = Don't enable and don't run +# # 1 = Can be referenced in code but doesn't run +# # 2 = Can be referenced in code and runs in client +# enable_starlight_forge=0 +# enable_terraforged=0 diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties index 4a4b12764..89c022985 100644 --- a/versionProperties/1.19.2.properties +++ b/versionProperties/1.19.2.properties @@ -1,47 +1,53 @@ +# @Depricated +# Support will be removed soon + # 1.19.2 version -java_version = 17 -minecraft_version=1.19.2 -parchment_version=2022.08.10 -compatible_minecraft_versions=["1.19.2"] -accessWidenerVersion=1_19 -builds_for=fabric,forge -# Fabric loader -fabric_loader_version=0.14.9 -fabric_api_version=0.60.0+1.19.2 - # Fabric mod versions - modmenu_version=4.0.6 - starlight_version_fabric= - phosphor_version_fabric= - lithium_version= - sodium_version=mc1.19.2-0.4.4 - iris_version=1.19.2-v1.3.1 - bclib_version=1.4.5 - immersive_portals_version= - canvas_version=mc119-1.0.2480 - # Fabric mod run - # 0 = Don't enable and don't run - # 1 = Can be referenced in code but doesn't run - # 2 = Can be referenced in code and runs in client - enable_starlight=0 - enable_phosphor=0 - enable_sodium=1 - enable_lithium=0 - enable_iris=0 - enable_bclib=1 - enable_canvas=0 -# Forge loader - forge_version=43.1.1 -# forge_version=43.1.34 - # Forge mod versions - starlight_version_forge=0 - terraforged_version= - - # Forge mod run - # 0 = Don't enable and don't run - # 1 = Can be referenced in code but doesn't run - # 2 = Can be referenced in code and runs in client - enable_starlight_forge=0 - enable_terraforged=0 +#java_version = 17 +#minecraft_version=1.19.2 +#parchment_version=2022.08.10 +#compatible_minecraft_versions=["1.19.2"] +#accessWidenerVersion=1_19 +#builds_for=fabric,forge +# +## Fabric loader +#fabric_loader_version=0.14.9 +#fabric_api_version=0.60.0+1.19.2 +# # Fabric mod versions +# modmenu_version=4.0.6 +# starlight_version_fabric= +# phosphor_version_fabric= +# lithium_version= +# sodium_version=mc1.19.2-0.4.4 +# iris_version=1.19.2-v1.3.1 +# bclib_version=1.4.5 +# immersive_portals_version= +# canvas_version=mc119-1.0.2480 +# +# # Fabric mod run +# # 0 = Don't enable and don't run +# # 1 = Can be referenced in code but doesn't run +# # 2 = Can be referenced in code and runs in client +# enable_starlight=0 +# enable_phosphor=0 +# enable_sodium=1 +# enable_lithium=0 +# enable_iris=0 +# enable_bclib=1 +# enable_canvas=0 +# +## Forge loader +# forge_version=43.1.1 +## forge_version=43.1.34 +# # Forge mod versions +# starlight_version_forge=0 +# terraforged_version= +# +# # Forge mod run +# # 0 = Don't enable and don't run +# # 1 = Can be referenced in code but doesn't run +# # 2 = Can be referenced in code and runs in client +# enable_starlight_forge=0 +# enable_terraforged=0 diff --git a/versionProperties/1.19.properties b/versionProperties/1.19.properties index 1a94a7178..2e4139b30 100644 --- a/versionProperties/1.19.properties +++ b/versionProperties/1.19.properties @@ -7,18 +7,18 @@ accessWidenerVersion=1_19 builds_for=fabric,forge # Fabric loader -fabric_loader_version=0.14.7 -fabric_api_version=0.55.3+1.19 +fabric_loader_version=0.14.21 +fabric_api_version=0.58.0+1.19 # Fabric mod versions - modmenu_version=4.0.0 + modmenu_version=4.0.4 starlight_version_fabric= phosphor_version_fabric= lithium_version= - sodium_version=3820973 - iris_version=1.19.x-v1.2.5 + sodium_version=mc1.19.2-0.4.4 + iris_version=1.6.4+1.19.2 bclib_version= - immersive_portals_version = - canvas_version=mc118:1.0.2397 + immersive_portals_version= + canvas_version=mc119-1.0.2453 # Fabric mod run # 0 = Don't enable and don't run @@ -29,13 +29,13 @@ fabric_api_version=0.55.3+1.19 enable_sodium=1 enable_lithium=0 enable_iris=0 - enable_bclib=0 + enable_bclib=1 enable_canvas=0 # Forge loader -forge_version=41.0.19 +forge_version=41.1.0 # Forge mod versions - starlight_version_forge=0 + starlight_version_forge= terraforged_version= # Forge mod run