Merge pull request #1276 from Artienia80/master

Aether portal for supplementaries map
MehVahdJukaar · Dec 27, 2024 · 65908f1 · 65908f1
2 parents f1a3a95 + d51b0ab
commit 65908f1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/...rc/main/java/net/mehvahdjukaar/supplementaries/common/misc/map_markers/ModMapMarkers.java b/...rc/main/java/net/mehvahdjukaar/supplementaries/common/misc/map_markers/ModMapMarkers.java
@@ -29,6 +29,8 @@ public class ModMapMarkers {
             Supplementaries.res("flag"), FlagMarker::new, FlagMarker::getFromWorld, ColoredDecoration::new);
     public static final CustomDecorationType<CustomMapDecoration, NetherPortalMarker> NETHER_PORTAL_DECORATION_TYPE = CustomDecorationType.withWorldMarker(
             Supplementaries.res("nether_portal"), NetherPortalMarker::new, NetherPortalMarker::getFromWorld, CustomMapDecoration::new);
+    public static final CustomDecorationType<CustomMapDecoration, AetherPortalMarker> AETHER_PORTAL_DECORATION_TYPE = CustomDecorationType.withWorldMarker(
+            Supplementaries.res("aether_portal"), AetherPortalMarker::new, AetherPortalMarker::getFromWorld, CustomMapDecoration::new);
     public static final CustomDecorationType<CustomMapDecoration, BeaconMarker> BEACON_DECORATION_TYPE = CustomDecorationType.withWorldMarker(
             Supplementaries.res("beacon"), BeaconMarker::new, BeaconMarker::getFromWorld, CustomMapDecoration::new);
     public static final CustomDecorationType<ColoredDecoration, CeilingBannerMarker> BANNER_DECORATION_TYPE = CustomDecorationType.withWorldMarker(

diff --git a/...net/mehvahdjukaar/supplementaries/common/misc/map_markers/markers/AetherPortalMarker.java b/...net/mehvahdjukaar/supplementaries/common/misc/map_markers/markers/AetherPortalMarker.java
@@ -0,0 +1,26 @@
+package net.mehvahdjukaar.supplementaries.common.misc.map_markers.markers;
+
+import net.mehvahdjukaar.moonlight.api.map.markers.SimpleMapBlockMarker;
+import net.mehvahdjukaar.moonlight.api.util.Utils;
+import net.mehvahdjukaar.supplementaries.common.misc.map_markers.ModMapMarkers;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import org.jetbrains.annotations.Nullable;
+
+public class AetherPortalMarker extends SimpleMapBlockMarker {
+
+    public AetherPortalMarker() {
+        super(ModMapMarkers.AETHER_PORTAL_DECORATION_TYPE);
+    }
+
+    @Nullable
+    public static AetherPortalMarker getFromWorld(BlockGetter world, BlockPos pos) {
+        if (Utils.getID(getType().toString().equals("aether:aether_portal")) {
+            var m = new AetherPortalMarker();
+            m.setPos(pos);
+            return m;
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/...src/main/resources/assets/supplementaries/textures/map_marker/aether_portal.png b/...src/main/resources/assets/supplementaries/textures/map_marker/aether_portal.png
diff --git a/common/src/main/resources/data/supplementaries/moonlight/map_markers/aether_portal.json b/common/src/main/resources/data/supplementaries/moonlight/map_markers/aether_portal.json
@@ -0,0 +1,3 @@
+{
+  "custom_type": "supplementaries:aether_portal"
+}