Port to 1.19

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / common / interop / CommonInterop.java

diff --git a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
index 0dbfb795cba21370d1b9520f6909a6333fdfd23f..9af5d35f97162231c844b41321159b715edd870e 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
+++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
@@ -1,32 +1,74 @@
 package com.irtimaled.bbor.common.interop;
 
+import com.irtimaled.bbor.client.ClientRenderer;
+import com.irtimaled.bbor.client.config.BoundingBoxTypeHelper;
+import com.irtimaled.bbor.client.config.ConfigManager;
+import com.irtimaled.bbor.client.renderers.AbstractRenderer;
+import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.common.EventBus;
-import com.irtimaled.bbor.common.events.*;
+import com.irtimaled.bbor.common.StructureProcessor;
+import com.irtimaled.bbor.common.events.PlayerLoggedIn;
+import com.irtimaled.bbor.common.events.PlayerLoggedOut;
+import com.irtimaled.bbor.common.events.PlayerSubscribed;
+import com.irtimaled.bbor.common.events.ServerTick;
+import com.irtimaled.bbor.common.events.StructuresLoaded;
+import com.irtimaled.bbor.common.events.WorldLoaded;
+import com.irtimaled.bbor.common.models.AbstractBoundingBox;
+import com.irtimaled.bbor.common.models.DimensionId;
 import com.irtimaled.bbor.common.models.ServerPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.world.WorldServer;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.gen.feature.structure.StructureStart;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.structure.StructureStart;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.WorldChunk;
+import net.minecraft.world.gen.structure.Structure;
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public class CommonInterop {
-    public static void chunkLoaded(Chunk chunk) {
-        int dimensionId = chunk.getWorld().getDimension().getType().getId();
-        Map<String, StructureStart> structures = chunk.getStructureStarts();
-        if(structures.size() > 0) EventBus.publish(new StructuresLoaded(structures, dimensionId));
+    public static void chunkLoaded(WorldChunk chunk) {
+        DimensionId dimensionId = DimensionId.from(chunk.getWorld().getRegistryKey());
+        Map<String, StructureStart> structures = new HashMap<>();
+        final Registry<Structure> structureRegistry = chunk.getWorld().getRegistryManager().get(Registry.STRUCTURE_KEY);
+        for (Map.Entry<Structure, StructureStart> es : chunk.getStructureStarts().entrySet()) {
+            final Optional<RegistryKey<Structure>> optional = structureRegistry.getKey(es.getKey());
+            optional.ifPresent(key -> structures.put(key.getValue().toString(), es.getValue()));
+        }
+        if (structures.size() > 0) EventBus.publish(new StructuresLoaded(structures, dimensionId));
     }
 
-    public static void loadWorlds(Collection<WorldServer> worlds) {
-        for (WorldServer world : worlds) {
+    public static void loadWorlds(Collection<ServerWorld> worlds) {
+        for (ServerWorld world : worlds) {
             loadWorld(world);
+            loadWorldStructures(world);
         }
     }
 
-    public static void loadWorld(WorldServer world) {
+    public static void loadWorldStructures(World world) {
+        final Registry<Structure> structureRegistry = world.getRegistryManager().get(Registry.STRUCTURE_KEY);
+        System.out.println("Registring structures: " + Arrays.toString(structureRegistry.getEntrySet().stream().map(entry -> entry.getKey().getValue().toString()).distinct().toArray(String[]::new)));
+        for (var entry : structureRegistry.getEntrySet()) {
+            final Identifier value = entry.getKey().getValue();
+            final BoundingBoxType boundingBoxType = BoundingBoxType.register("structure:" + value);
+            StructureProcessor.registerSupportedStructure(boundingBoxType);
+            StructureProcessor.supportedStructureIds.add(value.toString());
+            BoundingBoxTypeHelper.registerType(boundingBoxType, ConfigManager.structureShouldRender(value.toString()), ConfigManager.structureColor(value.toString()));
+        }
+    }
+
+    public static void loadWorld(ServerWorld world) {
         EventBus.publish(new WorldLoaded(world));
     }
 
@@ -34,25 +76,28 @@ public class CommonInterop {
         EventBus.publish(new ServerTick());
     }
 
-    public static void worldTick(WorldServer worldServer) {
-        EventBus.publish(new ServerWorldTick(worldServer));
-    }
-
-    public static void playerLoggedIn(EntityPlayerMP player) {
-        NetHandlerPlayServer connection = player.connection;
+    public static void playerLoggedIn(ServerPlayerEntity player) {
+        ServerPlayNetworkHandler connection = player.networkHandler;
         if (connection == null) return;
 
-        NetworkManager networkManager = connection.netManager;
-        if (networkManager.isLocalChannel()) return;
+        ClientConnection networkManager = connection.connection;
+        if (networkManager.isLocal()) return;
 
         EventBus.publish(new PlayerLoggedIn(new ServerPlayer(player)));
     }
 
-    public static void playerLoggedOut(EntityPlayerMP player) {
-        EventBus.publish(new PlayerLoggedOut(player.getEntityId()));
+    public static void playerLoggedOut(ServerPlayerEntity player) {
+        EventBus.publish(new PlayerLoggedOut(player.getId()));
+    }
+
+    public static void playerSubscribed(ServerPlayerEntity player) {
+        EventBus.publish(new PlayerSubscribed(player.getId(), new ServerPlayer(player)));
     }
 
-    public static void playerSubscribed(EntityPlayerMP player) {
-        EventBus.publish(new PlayerSubscribed(player.getEntityId(), new ServerPlayer(player)));
+    public static <T extends AbstractBoundingBox> AbstractRenderer<T> registerRenderer(Class<? extends T> type, Supplier<AbstractRenderer<T>> renderer) {
+        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            return ClientRenderer.registerRenderer(type, renderer);
+        }
+        return null;
     }
 }