Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev

This commit is contained in:
simibubi 2023-09-21 20:46:41 +02:00
commit 32e50c9c35
2 changed files with 4 additions and 1 deletions

View File

@ -14,6 +14,7 @@ import net.minecraftforge.registries.ForgeRegistries;
* For compatibility with and without another mod present, we have to define load conditions of the specific code
*/
public enum Mods {
AETHER,
COMPUTERCRAFT,
CONNECTIVITY,
CURIOS,

View File

@ -3,6 +3,7 @@ package com.simibubi.create.content.trains.track;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import com.simibubi.create.compat.Mods;
import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
import com.simibubi.create.foundation.utility.AttachedRegistry;
import com.simibubi.create.foundation.utility.BlockFace;
@ -61,6 +62,7 @@ public class AllPortalTracks {
public static void registerDefaults() {
registerIntegration(Blocks.NETHER_PORTAL, AllPortalTracks::nether);
if (Mods.AETHER.isLoaded())
registerIntegration(new ResourceLocation("aether", "aether_portal"), AllPortalTracks::aether);
}