mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 14:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/simibubi/create/compat/Mods.java
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 * For compatibility with and without another mod present, we have to define load conditions of the specific code
*/ */
public enum Mods { public enum Mods {
AETHER,
COMPUTERCRAFT, COMPUTERCRAFT,
CONNECTIVITY, CONNECTIVITY,
CURIOS, CURIOS,

4
src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java
View File

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