X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Firtimaled%2Fbbor%2Fcommon%2Fmessages%2FBoundingBoxSerializer.java;h=f8498381f10765fa0ca1a6cc75c5638ef6c91abe;hb=8b00bea443167b9e6e7c1a30b5c25994d301cfab;hp=40d9084054e011775a1e4931eec370977a021dba;hpb=6f40aea99dccba18851a20d2ba4d8f11db95c6aa;p=BoundingBoxOutlineReloaded.git

diff --git a/src/main/java/com/irtimaled/bbor/common/messages/BoundingBoxSerializer.java b/src/main/java/com/irtimaled/bbor/common/messages/BoundingBoxSerializer.java
index 40d9084..f849838 100644
--- a/src/main/java/com/irtimaled/bbor/common/messages/BoundingBoxSerializer.java
+++ b/src/main/java/com/irtimaled/bbor/common/messages/BoundingBoxSerializer.java
@@ -1,6 +1,7 @@
 package com.irtimaled.bbor.common.messages;
 
-import com.irtimaled.bbor.common.models.*;
+import com.irtimaled.bbor.common.models.AbstractBoundingBox;
+import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,9 +11,7 @@ class BoundingBoxSerializer {
     private static final Map<Class, BiConsumer<AbstractBoundingBox, PayloadBuilder>> serializers = new HashMap<>();
 
     static {
-        serializers.put(BoundingBoxVillage.class, (bb, pb) -> serializeVillage((BoundingBoxVillage) bb, pb));
-        serializers.put(BoundingBoxStructure.class, (bb, pb) -> serializeStructure((BoundingBoxStructure) bb, pb));
-        serializers.put(BoundingBoxMobSpawner.class, (bb, pb) -> serializeMobSpawner((BoundingBoxMobSpawner) bb, pb));
+        serializers.put(BoundingBoxCuboid.class, (bb, pb) -> serializeStructure((BoundingBoxCuboid)bb, pb));
     }
 
     static boolean canSerialize(AbstractBoundingBox key) {
@@ -26,26 +25,10 @@ class BoundingBoxSerializer {
         serializer.accept(boundingBox, builder);
     }
 
-    private static void serializeVillage(BoundingBoxVillage boundingBox, PayloadBuilder builder) {
-        builder.writeChar('V')
-                .writeCoords(boundingBox.getCenter())
-                .writeVarInt(boundingBox.getRadius())
-                .writeBoolean(boundingBox.getSpawnsIronGolems())
-                .writeVarInt(boundingBox.getColor().getRGB());
-        for (Coords door : boundingBox.getDoors()) {
-            builder.writeCoords(door);
-        }
-    }
-
-    private static void serializeStructure(BoundingBoxStructure boundingBox, PayloadBuilder builder) {
+    private static void serializeStructure(BoundingBoxCuboid boundingBox, PayloadBuilder builder) {
         builder.writeChar('S')
-                .writeInt(boundingBox.getTypeName().hashCode())
+                .writeInt(boundingBox.getType().hashCode())
                 .writeCoords(boundingBox.getMinCoords())
                 .writeCoords(boundingBox.getMaxCoords());
     }
-
-    private static void serializeMobSpawner(BoundingBoxMobSpawner boundingBox, PayloadBuilder builder) {
-        builder.writeChar('M')
-                .writeCoords(boundingBox.getCoords());
-    }
 }