Fix error if biome water-color effect has alpha. Fixes: #715

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/resources/adapter/PostDeserialize.java

@@ -0,0 +1,10 @@
+package de.bluecolored.bluemap.core.resources.adapter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface PostDeserialize {}

core/src/main/java/de/bluecolored/bluemap/core/resources/adapter/PostDeserializeAdapterFactory.java

@@ -0,0 +1,46 @@
+package de.bluecolored.bluemap.core.resources.adapter;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class PostDeserializeAdapterFactory implements TypeAdapterFactory {
+
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+        for (Method method : type.getRawType().getDeclaredMethods()) {
+            if (method.isAnnotationPresent(PostDeserialize.class) && method.getParameterCount() == 0) {
+                TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
+                return new TypeAdapter<>() {
+
+                    @Override
+                    public void write(JsonWriter out, T value) throws IOException {
+                        delegate.write(out, value);
+                    }
+
+                    @Override
+                    public T read(JsonReader in) throws IOException {
+                        try {
+                            T obj = delegate.read(in);
+                            method.setAccessible(true);
+                            method.invoke(obj);
+                            return obj;
+                        } catch (IllegalAccessException | InvocationTargetException e) {
+                            throw new IOException(e);
+                        }
+                    }
+
+                };
+            }
+        }
+        return null;
+    }
+
+}

core/src/main/java/de/bluecolored/bluemap/core/resources/adapter/ResourcesGson.java

@@ -49,6 +49,7 @@ public class ResourcesGson {
 
     public static GsonBuilder addAdapter(GsonBuilder builder) {
         return builder
+                .registerTypeAdapterFactory(new PostDeserializeAdapterFactory())
                 .registerTypeAdapter(Key.class, new KeyAdapter())
                 .registerTypeAdapter(Axis.class, new AxisAdapter())
                 .registerTypeAdapter(Color.class, new ColorAdapter())

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/datapack/biome/DatapackBiome.java

@@ -24,6 +24,8 @@
  */
 package de.bluecolored.bluemap.core.resources.pack.datapack.biome;
 
+import de.bluecolored.bluemap.core.logger.Logger;
+import de.bluecolored.bluemap.core.resources.adapter.PostDeserialize;
 import de.bluecolored.bluemap.core.util.Key;
 import de.bluecolored.bluemap.core.util.math.Color;
 import de.bluecolored.bluemap.core.world.biome.Biome;
@@ -87,6 +89,12 @@ public static class Effects {
         private Color grassColor = Biome.DEFAULT.getOverlayGrassColor();
         private GrassColorModifier grassColorModifier = Biome.DEFAULT.getGrassColorModifier();
 
+        @PostDeserialize
+        private void init() {
+            waterColor.a = 1f;
+            Logger.global.logInfo("Biome-Effects Initialized!");
+        }
+
     }
 
 }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/blockstate/Variant.java

@@ -24,24 +24,20 @@
  */
 package de.bluecolored.bluemap.core.resources.pack.resourcepack.blockstate;
 
-import com.google.gson.Gson;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
 import de.bluecolored.bluemap.core.map.hires.block.BlockRendererType;
-import de.bluecolored.bluemap.core.resources.adapter.AbstractTypeAdapterFactory;
 import de.bluecolored.bluemap.core.resources.ResourcePath;
-import de.bluecolored.bluemap.core.resources.pack.resourcepack.model.Model;
+import de.bluecolored.bluemap.core.resources.adapter.PostDeserialize;
 import de.bluecolored.bluemap.core.resources.pack.resourcepack.ResourcePack;
+import de.bluecolored.bluemap.core.resources.pack.resourcepack.model.Model;
 import de.bluecolored.bluemap.core.util.math.MatrixM4f;
-import lombok.*;
-
-import java.io.IOException;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal", "unused"})
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-@JsonAdapter(Variant.Adapter.class)
 public class Variant {
 
     @Setter
@@ -76,6 +72,7 @@ public Variant(ResourcePath<Model> model, float x, float y, boolean uvlock, doub
         init();
     }
 
+    @PostDeserialize
     private void init() {
         this.transformed = x != 0 || y != 0;
         this.transformMatrix = new MatrixM4f()
@@ -84,19 +81,4 @@ private void init() {
                 .translate(0.5f, 0.5f, 0.5f);
     }
 
-    static class Adapter extends AbstractTypeAdapterFactory<Variant> {
-
-        public Adapter() {
-            super(Variant.class);
-        }
-
-        @Override
-        public Variant read(JsonReader in, Gson gson) throws IOException {
-            Variant variant = gson.getDelegateAdapter(this, TypeToken.get(Variant.class)).read(in);
-            variant.init();
-            return variant;
-        }
-
-    }
-
 }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/entitystate/Part.java

@@ -32,6 +32,7 @@
 import de.bluecolored.bluemap.core.map.hires.entity.EntityRendererType;
 import de.bluecolored.bluemap.core.resources.adapter.AbstractTypeAdapterFactory;
 import de.bluecolored.bluemap.core.resources.ResourcePath;
+import de.bluecolored.bluemap.core.resources.adapter.PostDeserialize;
 import de.bluecolored.bluemap.core.resources.pack.resourcepack.ResourcePack;
 import de.bluecolored.bluemap.core.resources.pack.resourcepack.model.Model;
 import de.bluecolored.bluemap.core.util.math.MatrixM4f;
@@ -40,7 +41,6 @@
 import java.io.IOException;
 
 @SuppressWarnings("FieldMayBeFinal")
-@JsonAdapter(Part.Adapter.class)
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter
 public class Part {
@@ -67,26 +67,11 @@ public Part(ResourcePath<Model> model, Vector3f position, Vector3f rotation) {
         init();
     }
 
+    @PostDeserialize
     private void init() {
         this.transformed = !position.equals(Vector3f.ZERO) || !rotation.equals(Vector3f.ZERO);
         this.transformMatrix = new MatrixM4f()
                 .rotate(rotation.getX(), rotation.getY(), rotation.getZ())
                 .translate(position.getX(), position.getY(), position.getZ());
     }
-
-    static class Adapter extends AbstractTypeAdapterFactory<Part> {
-
-        public Adapter() {
-            super(Part.class);
-        }
-
-        @Override
-        public Part read(JsonReader in, Gson gson) throws IOException {
-            Part part = gson.getDelegateAdapter(this, TypeToken.get(Part.class)).read(in);
-            part.init();
-            return part;
-        }
-
-    }
-
 }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/model/Element.java

@@ -32,6 +32,7 @@
 import com.google.gson.stream.JsonReader;
 import de.bluecolored.bluemap.core.resources.ResourcePath;
 import de.bluecolored.bluemap.core.resources.adapter.AbstractTypeAdapterFactory;
+import de.bluecolored.bluemap.core.resources.adapter.PostDeserialize;
 import de.bluecolored.bluemap.core.resources.pack.ResourcePool;
 import de.bluecolored.bluemap.core.resources.pack.resourcepack.ResourcePack;
 import de.bluecolored.bluemap.core.resources.pack.resourcepack.texture.Texture;
@@ -45,7 +46,6 @@
 import java.util.Map;
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal", "unused"})
-@JsonAdapter(Element.Adapter.class)
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter
 public class Element {
@@ -93,6 +93,7 @@ private Element(Element copyFrom) {
         copyFrom.faces.forEach((direction, face) -> this.faces.put(direction, face.copy()));
     }
 
+    @PostDeserialize
     private void init() {
         faces.forEach((direction, face) -> face.init(direction, this::calculateDefaultUV));
     }
@@ -132,19 +133,4 @@ public void optimize(ResourcePool<Texture> texturePool) {
         }
     }
 
-    static class Adapter extends AbstractTypeAdapterFactory<Element> {
-
-        public Adapter() {
-            super(Element.class);
-        }
-
-        @Override
-        public Element read(JsonReader in, Gson gson) throws IOException {
-            Element element = gson.getDelegateAdapter(this, TypeToken.get(Element.class)).read(in);
-            element.init();
-            return element;
-        }
-
-    }
-
 }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/model/Rotation.java

@@ -32,6 +32,7 @@
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import de.bluecolored.bluemap.core.resources.adapter.AbstractTypeAdapterFactory;
+import de.bluecolored.bluemap.core.resources.adapter.PostDeserialize;
 import de.bluecolored.bluemap.core.util.math.Axis;
 import de.bluecolored.bluemap.core.util.math.MatrixM4f;
 import lombok.AccessLevel;
@@ -41,7 +42,6 @@
 import java.io.IOException;
 
 @SuppressWarnings("FieldMayBeFinal")
-@JsonAdapter(Rotation.Adapter.class)
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter
 public class Rotation {
@@ -66,6 +66,7 @@ public Rotation(Vector3f origin, Axis axis, float angle, boolean rescale) {
         init();
     }
 
+    @PostDeserialize
     private void init() {
         Vector3i axisAngle = axis.toVector();
 
@@ -92,19 +93,4 @@ private void init() {
         }
     }
 
-    static class Adapter extends AbstractTypeAdapterFactory<Rotation> {
-
-        public Adapter() {
-            super(Rotation.class);
-        }
-
-        @Override
-        public Rotation read(JsonReader in, Gson gson) throws IOException {
-            Rotation rotation = gson.getDelegateAdapter(this, TypeToken.get(Rotation.class)).read(in);
-            rotation.init();
-            return rotation;
-        }
-
-    }
-
 }