v0.8.0 Overhaul

.gitignore

@@ -23,6 +23,7 @@ eclipse
 run
 resources/__pycache__
 libs
+tmp
 
 # Files from Forge MDK
 forge*changelog.txt

build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
-version = '0.5.19-dev.7'
+version = '0.8.0-dev.0'
 group = 'com.eerussianguy.blazemap' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "BlazeMap-${minecraft_version}"
 
@@ -76,6 +76,15 @@ dependencies {
 //    implementation fg.deobf("_:TerraFirmaCraft:Forge-1.18.2-2.1.11-beta")
 //    implementation fg.deobf("_:Cartography:1.18.2-0.4.0-alpha3")
 
+    implementation fg.deobf("_:ftb-chunks:${ftbchunks_version}")
+    implementation fg.deobf("_:ftb-teams:${ftbteams_version}")
+    implementation fg.deobf("_:ftb-library:$ftblib_version")
+    implementation fg.deobf("_:architectury:${architectury_version}")
+
+    // implementation fg.deobf("_:journeymap:1.20.1-5.10.0-forge")
+    // implementation fg.deobf("_:Xaeros_Minimap:24.2.0_Forge_1.20")
+    // implementation fg.deobf("_:XaerosWorldMap:1.38.8_Forge_1.20")
+
 
     // Apply Mixin AP
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'

gradle.properties

@@ -2,7 +2,13 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
+mappings_channel=official
+mappings_version=1.18.2
+
 minecraft_version=1.18.2
 forge_version=40.2.17
-mappings_channel=official
-mappings_version=1.18.2
+
+ftbchunks_version=forge-1802.3.19-build.362
+ftbteams_version=forge-1802.2.11-build.107
+ftblib_version=forge-1802.3.11-build.177
+architectury_version=4.12.94-forge

src/main/java/com/eerussianguy/blazemap/BlazeMap.java

@@ -1,5 +1,8 @@
 package com.eerussianguy.blazemap;
 
+import java.util.List;
+
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.IExtensionPoint;
@@ -9,13 +12,16 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 
-import com.eerussianguy.blazemap.api.BlazeMapAPI;
 import com.eerussianguy.blazemap.config.BlazeMapConfig;
-import com.eerussianguy.blazemap.engine.client.BlazeMapClientEngine;
-import com.eerussianguy.blazemap.engine.server.BlazeMapServerEngine;
+import com.eerussianguy.blazemap.engine.RegistryController;
+import com.eerussianguy.blazemap.engine.client.ClientEngine;
+import com.eerussianguy.blazemap.engine.server.ServerEngine;
 import com.eerussianguy.blazemap.feature.BlazeMapCommandsClient;
 import com.eerussianguy.blazemap.feature.BlazeMapFeaturesClient;
 import com.eerussianguy.blazemap.feature.BlazeMapFeaturesCommon;
+import com.eerussianguy.blazemap.integration.KnownMods;
+import com.eerussianguy.blazemap.integration.ModIntegration;
+import com.eerussianguy.blazemap.integration.ftbchunks.FTBChunksPlugin;
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;
 
@@ -28,6 +34,14 @@ public class BlazeMap {
     public static final String MOD_ID = "blazemap";
     public static final String MOD_NAME = "Blaze Map";
 
+    public static final List<ModIntegration> INTEGRATIONS = List.of(
+        new FTBChunksPlugin()
+    );
+
+    public static ResourceLocation resource(String name) {
+        return new ResourceLocation(MOD_ID, name);
+    }
+
     public BlazeMap() {
         ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "Nothing", (remote, isServer) -> true));
         final IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
@@ -43,26 +57,26 @@ public BlazeMap() {
             // DebuggingEventHandler.init();
         }
         else {
-            // These are forbidden in the dedicated server.
+            // Client side objects are forbidden in the dedicated server.
             // The others are frozen by the RegistryController when the time comes.
-            BlazeMapAPI.LAYERS.freeze();
-            BlazeMapAPI.MAPTYPES.freeze();
-            BlazeMapAPI.OBJECT_RENDERERS.freeze();
+            RegistryController.freezeClientRegistries();
         }
     }
 
     public void setup(FMLCommonSetupEvent event) {
+        KnownMods.init();
+
         // We are client side, enable client engine. Required on client.
         if(FMLEnvironment.dist == Dist.CLIENT) {
-            BlazeMapClientEngine.init();
+            ClientEngine.init();
         }
 
         // Regardless of side, server engine is optional.
         // This might be helpful later on, on server side, where we want the engine off but other features on.
         // So removing the mod to disable the server engine will not be an option.
         // For now, though, there are no other server features.
         if(BlazeMapConfig.COMMON.enableServerEngine.get()){
-            BlazeMapServerEngine.init();
+            ServerEngine.init();
         }
 
         // Initialize common sided features
@@ -71,9 +85,14 @@ public void setup(FMLCommonSetupEvent event) {
         // Initialize client-only features
         if(FMLEnvironment.dist == Dist.CLIENT) {
             BlazeMapFeaturesClient.initMapping();
+            BlazeMapFeaturesClient.initOverlays();
             BlazeMapFeaturesClient.initMaps();
             BlazeMapFeaturesClient.initWaypoints();
             BlazeMapCommandsClient.init();
         }
+
+        for(var integration : INTEGRATIONS) {
+            integration.init();
+        }
     }
 }

src/main/java/com/eerussianguy/blazemap/FMLEventHandler.java

@@ -5,7 +5,7 @@
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
-import com.eerussianguy.blazemap.feature.Overlays;
+import com.eerussianguy.blazemap.feature.IngameOverlays;
 
 
 public class FMLEventHandler {
@@ -18,10 +18,10 @@ public static void init() {
     }
 
     private static void clientSetup(final FMLClientSetupEvent event) {
-        Overlays.reload();
+        IngameOverlays.reload();
     }
 
     private static void onConfigReload(ModConfigEvent.Reloading event) {
-        Overlays.reload();
+        IngameOverlays.reload();
     }
 }

src/main/java/com/eerussianguy/blazemap/gui/BlazeGui.java → src/main/java/com/eerussianguy/blazemap/__deprecated/BlazeGui.java

@@ -1,4 +1,4 @@
-package com.eerussianguy.blazemap.gui;
+package com.eerussianguy.blazemap.__deprecated;
 
 import javax.annotation.Nonnull;
 
@@ -11,16 +11,17 @@
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 
-import com.eerussianguy.blazemap.util.Colors;
-import com.eerussianguy.blazemap.util.Helpers;
-import com.eerussianguy.blazemap.util.RenderHelper;
+import com.eerussianguy.blazemap.BlazeMap;
+import com.eerussianguy.blazemap.lib.Colors;
+import com.eerussianguy.blazemap.lib.RenderHelper;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 
+@Deprecated
 public abstract class BlazeGui extends Screen {
     private static final TextComponent EMPTY = new TextComponent("");
-    public static final ResourceLocation SLOT = Helpers.identifier("textures/gui/slot.png");
-    public static final ResourceLocation GUI = Helpers.identifier("textures/gui/gui.png");
+    public static final ResourceLocation SLOT = BlazeMap.resource("textures/gui/slot.png");
+    public static final ResourceLocation GUI = BlazeMap.resource("textures/gui/gui.png");
 
     protected final RenderType background, slot;
     protected int guiWidth, guiHeight;

src/main/java/com/eerussianguy/blazemap/feature/maps/LayerButton.java → src/main/java/com/eerussianguy/blazemap/__deprecated/LayerButton.java

@@ -1,26 +1,33 @@
-package com.eerussianguy.blazemap.feature.maps;
+package com.eerussianguy.blazemap.__deprecated;
 
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 
 import com.eerussianguy.blazemap.api.BlazeRegistry.Key;
 import com.eerussianguy.blazemap.api.maps.Layer;
 import com.eerussianguy.blazemap.api.maps.MapType;
-import com.eerussianguy.blazemap.util.Colors;
-import com.eerussianguy.blazemap.util.RenderHelper;
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.eerussianguy.blazemap.feature.maps.ui.MapHost;
+import com.eerussianguy.blazemap.integration.KnownMods;
+import com.eerussianguy.blazemap.lib.Colors;
+import com.eerussianguy.blazemap.lib.RenderHelper;
 import com.mojang.blaze3d.vertex.PoseStack;
 
+@Deprecated
 public class LayerButton extends ImageButton {
     private final Key<Layer> key;
     private final MapType parent;
-    private final IMapHost host;
+    private final MapHost host;
+    private final Component owner;
 
-    public LayerButton(int px, int py, int w, int h, Key<Layer> key, MapType parent, IMapHost host) {
+    public LayerButton(int px, int py, int w, int h, Key<Layer> key, MapType parent, MapHost host) {
         super(px, py, w, h, 0, 0, 0, key.value().getIcon(), w, h, button -> {
             host.toggleLayer(key);
         }, key.value().getName());
         this.key = key;
         this.parent = parent;
+        this.owner = new TextComponent(KnownMods.getOwnerName(key)).withStyle(ChatFormatting.BLUE);
         this.host = host;
         checkVisible();
     }
@@ -37,8 +44,8 @@ public void render(PoseStack stack, int mx, int my, float partial) {
 
     @Override
     public void renderToolTip(PoseStack stack, int x, int y) {
-        RenderSystem.setShaderColor(1, 1, 1, 1);
-        host.drawTooltip(stack, key.value().getName(), x, y);
+        //RenderSystem.setShaderColor(1, 1, 1, 1);
+        //host.drawTooltip(stack, x, y, key.value().getName(), owner);
     }
 
     public void checkVisible() {

src/main/java/com/eerussianguy/blazemap/feature/maps/MapTypeButton.java → src/main/java/com/eerussianguy/blazemap/__deprecated/MapTypeButton.java

@@ -1,39 +1,43 @@
-package com.eerussianguy.blazemap.feature.maps;
+package com.eerussianguy.blazemap.__deprecated;
 
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.ImageButton;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 
 import com.eerussianguy.blazemap.api.BlazeRegistry.Key;
 import com.eerussianguy.blazemap.api.maps.MapType;
-import com.eerussianguy.blazemap.util.Colors;
-import com.eerussianguy.blazemap.util.RenderHelper;
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.eerussianguy.blazemap.feature.maps.ui.MapHost;
+import com.eerussianguy.blazemap.integration.KnownMods;
+import com.eerussianguy.blazemap.lib.Colors;
+import com.eerussianguy.blazemap.lib.RenderHelper;
 import com.mojang.blaze3d.vertex.PoseStack;
 
+@Deprecated
 public class MapTypeButton extends ImageButton {
     private final Key<MapType> key;
-    private final IMapHost host;
+    private final MapHost host;
+    private final Component owner;
 
-    public MapTypeButton(int px, int py, int w, int h, Key<MapType> key, IMapHost host) {
+    public MapTypeButton(int px, int py, int w, int h, Key<MapType> key, MapHost host) {
         super(px, py, w, h, 0, 0, 0, key.value().getIcon(), w, h, button -> {
             host.setMapType(key.value());
-            for(GuiEventListener widget : host.getChildren()) {
+            /*for(GuiEventListener widget : host.getChildren()) {
                 if(widget instanceof LayerButton lb) {
                     lb.checkVisible();
                 }
-            }
+            }*/
         }, key.value().getName());
 
         this.host = host;
         this.key = key;
+        this.owner = new TextComponent(KnownMods.getOwnerName(key)).withStyle(ChatFormatting.BLUE);
     }
 
     @Override
     public void renderToolTip(PoseStack stack, int x, int y) {
-        RenderSystem.setShaderColor(1, 1, 1, 1);
-        TranslatableComponent component = key.value().getName();
-        host.drawTooltip(stack, component, x, y);
+        //RenderSystem.setShaderColor(1, 1, 1, 1);
+        //host.drawTooltip(stack, x, y, key.value().getName(), owner);
     }
 
     @Override

src/main/java/com/eerussianguy/blazemap/api/BlazeMapAPI.java

@@ -2,6 +2,7 @@
 
 import com.eerussianguy.blazemap.api.maps.Layer;
 import com.eerussianguy.blazemap.api.maps.MapType;
+import com.eerussianguy.blazemap.api.maps.Overlay;
 import com.eerussianguy.blazemap.api.markers.ObjectRenderer;
 import com.eerussianguy.blazemap.api.pipeline.*;
 
@@ -28,5 +29,6 @@ public class BlazeMapAPI {
     public static final BlazeRegistry<Layer> LAYERS = new BlazeRegistry<>();
 
     public static final BlazeRegistry<MapType> MAPTYPES = new BlazeRegistry<>();
+    public static final BlazeRegistry<Overlay> OVERLAYS = new BlazeRegistry<>();
     public static final BlazeRegistry<ObjectRenderer<?>> OBJECT_RENDERERS = new BlazeRegistry<>();
 }

src/main/java/com/eerussianguy/blazemap/api/BlazeMapReferences.java

@@ -6,6 +6,7 @@
 
 import com.eerussianguy.blazemap.api.maps.Layer;
 import com.eerussianguy.blazemap.api.maps.MapType;
+import com.eerussianguy.blazemap.api.maps.Overlay;
 import com.eerussianguy.blazemap.api.markers.ObjectRenderer;
 import com.eerussianguy.blazemap.api.pipeline.Collector;
 import com.eerussianguy.blazemap.api.pipeline.DataType;
@@ -54,6 +55,17 @@ public static class MapTypes {
         public static final Key<MapType> NETHER = new Key<>(MAPTYPES, MODID, "nether");
     }
 
+    public static class Overlays {
+        public static final Key<Overlay> GRID = new Key<>(OVERLAYS, MODID, "grid");
+        public static final Key<Overlay> PLAYERS = new Key<>(OVERLAYS, MODID, "players");
+        public static final Key<Overlay> NPCS = new Key<>(OVERLAYS, MODID, "npcs");
+        public static final Key<Overlay> ANIMALS = new Key<>(OVERLAYS, MODID, "animals");
+        public static final Key<Overlay> ENEMIES = new Key<>(OVERLAYS, MODID, "enemies");
+        public static final Key<Overlay> WAYPOINTS = new Key<>(OVERLAYS, MODID, "waypoints");
+
+        public static final Key<Overlay> FTBCHUNKS = new Key<>(OVERLAYS, MODID, "ftbchunks");
+    }
+
     public static class ObjectRenderers {
         public static final Key<ObjectRenderer<?>> DEFAULT = new Key<>(OBJECT_RENDERERS, MODID, "default");
     }

src/main/java/com/eerussianguy/blazemap/api/event/BlazeRegistriesFrozenEvent.java

@@ -0,0 +1,11 @@
+package com.eerussianguy.blazemap.api.event;
+
+import net.minecraftforge.eventbus.api.Event;
+
+/**
+ * Fired immediately after all registries have been frozen.
+ * Used by systems that need to be sure the registries will no longer be changed.
+ *
+ * @author LordFokas
+ */
+public class BlazeRegistriesFrozenEvent extends Event {}

src/main/java/com/eerussianguy/blazemap/api/event/BlazeRegistryEvent.java

@@ -6,6 +6,7 @@
 import com.eerussianguy.blazemap.api.BlazeRegistry;
 import com.eerussianguy.blazemap.api.maps.Layer;
 import com.eerussianguy.blazemap.api.maps.MapType;
+import com.eerussianguy.blazemap.api.maps.Overlay;
 import com.eerussianguy.blazemap.api.markers.ObjectRenderer;
 import com.eerussianguy.blazemap.api.pipeline.*;
 
@@ -64,6 +65,12 @@ public MapTypeRegistryEvent() {
         }
     }
 
+    public static class OverlayRegistryEvent extends BlazeRegistryEvent<Overlay> {
+        public OverlayRegistryEvent() {
+            super(BlazeMapAPI.OVERLAYS);
+        }
+    }
+
     public static class ObjectRendererRegistryEvent extends BlazeRegistryEvent<ObjectRenderer<?>> {
         public ObjectRendererRegistryEvent() {
             super(BlazeMapAPI.OBJECT_RENDERERS);