[v2.0.9-jv8]

Author: yuttyann

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.yuttyann</groupId>
   <artifactId>ScriptBlockPlus</artifactId>
-  <version>2.0.8</version>
+  <version>2.0.9</version>
 
   <name>ScriptBlockPlus</name>
   <url>https://github.com/yuttyann/ScriptBlockPlus</url>

src/main/java/com/github/yuttyann/scriptblockplus/file/json/BaseJson.java

@@ -23,6 +23,9 @@
 import com.github.yuttyann.scriptblockplus.file.json.builder.BlockCoordsDeserializer;
 import com.github.yuttyann.scriptblockplus.file.json.builder.BlockCoordsSerializer;
 import com.github.yuttyann.scriptblockplus.file.json.builder.FieldExclusion;
+import com.github.yuttyann.scriptblockplus.file.json.builder.ScriptKeyDeserializer;
+import com.github.yuttyann.scriptblockplus.file.json.builder.ScriptKeySerializer;
+import com.github.yuttyann.scriptblockplus.script.ScriptKey;
 import com.github.yuttyann.scriptblockplus.utils.collection.IntMap;
 import com.github.yuttyann.scriptblockplus.utils.collection.IntHashMap;
 import com.github.yuttyann.scriptblockplus.utils.unmodifiable.UnmodifiableBlockCoords;
@@ -116,6 +119,8 @@ public enum Status {
             b.serializeNulls();
             b.setPrettyPrinting();
             b.setExclusionStrategies(new FieldExclusion());
+            b.registerTypeAdapter(ScriptKey.class, new ScriptKeySerializer());
+            b.registerTypeAdapter(ScriptKey.class, new ScriptKeyDeserializer());
             b.registerTypeAdapter(BlockCoords.class, new BlockCoordsSerializer());
             b.registerTypeAdapter(BlockCoords.class, new BlockCoordsDeserializer());
             b.registerTypeAdapter(UnmodifiableBlockCoords.class, new BlockCoordsSerializer());
@@ -355,7 +360,7 @@ public final Status getStatus() {
      * @return {@link boolean} - 削除を行う場合は{@code true}
      */
     protected boolean isTemporary() {
-        return true;
+        return false;
     }
 
     /**

src/main/java/com/github/yuttyann/scriptblockplus/file/json/builder/ScriptKeyDeserializer.java

@@ -0,0 +1,48 @@
+/**
+ * ScriptBlockPlus - Allow you to add script to any blocks.
+ * Copyright (C) 2021 yuttyann44581
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.github.yuttyann.scriptblockplus.file.json.builder;
+
+import java.lang.reflect.Type;
+
+import com.github.yuttyann.scriptblockplus.script.ScriptKey;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * ScriptBlockPlus ScriptKeyDeserializer クラス
+ * @author yuttyann44581
+ */
+public class ScriptKeyDeserializer  implements JsonDeserializer<ScriptKey> {
+
+    @Override
+    @NotNull
+    public ScriptKey deserialize(@NotNull JsonElement json, @NotNull Type typeOfT, @NotNull JsonDeserializationContext context) throws JsonParseException {
+        if (json.isJsonObject()) {
+            JsonObject jsonObject = json.getAsJsonObject();
+            if (!jsonObject.has("name")) {
+                return ScriptKey.INTERACT;
+            }
+            return ScriptKey.valueOf(jsonObject.get("name").getAsString());
+        } else {
+            return ScriptKey.valueOf(json.getAsString());
+        }
+    }
+}

src/main/java/com/github/yuttyann/scriptblockplus/file/json/builder/ScriptKeySerializer.java

@@ -0,0 +1,38 @@
+/**
+ * ScriptBlockPlus - Allow you to add script to any blocks.
+ * Copyright (C) 2021 yuttyann44581
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.github.yuttyann.scriptblockplus.file.json.builder;
+
+import java.lang.reflect.Type;
+
+import com.github.yuttyann.scriptblockplus.script.ScriptKey;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * ScriptBlockPlus ScriptKeySerializer クラス
+ * @author yuttyann44581
+ */
+public class ScriptKeySerializer implements JsonSerializer<ScriptKey> {
+
+    @Override
+    @NotNull
+    public JsonElement serialize(@NotNull ScriptKey scriptKey, @NotNull Type typeOfSrc, @NotNull JsonSerializationContext context) {
+        return context.serialize(scriptKey.toString());
+    }
+}

src/main/java/com/github/yuttyann/scriptblockplus/file/json/derived/BlockScriptJson.java

@@ -44,11 +44,6 @@ protected BlockScriptJson(@NotNull ScriptKey scriptKey) {
         super(scriptKey.getName());
     }
 
-    @Override
-    protected boolean isTemporary() {
-        return false;
-    }
-
     @Override
     protected boolean isCacheFileExists() {
         return false;
@@ -62,7 +57,7 @@ public ScriptKey getScriptKey() {
     @Override
     @NotNull
     protected BlockScript newInstance() {
-        return new BlockScript(getScriptKey());
+        return new BlockScript();
     }
 
     @NotNull

src/main/java/com/github/yuttyann/scriptblockplus/file/json/derived/PlayerCountJson.java

@@ -47,11 +47,6 @@ protected PlayerCountJson(@NotNull UUID uuid) {
         super(uuid.toString());
     }
 
-    @Override
-    protected boolean isTemporary() {
-        return false;
-    }
-
     @Override
     @NotNull
     protected PlayerCount newInstance(@NotNull ScriptKey scriptKey, @NotNull BlockCoords location) {

src/main/java/com/github/yuttyann/scriptblockplus/file/json/derived/PlayerTempJson.java

@@ -47,11 +47,6 @@ protected PlayerTempJson(@NotNull UUID uuid) {
         super(uuid.toString());
     }
 
-    @Override
-    protected boolean isTemporary() {
-        return false;
-    }
-
     @Override
     @NotNull
     protected PlayerTemp newInstance() {

src/main/java/com/github/yuttyann/scriptblockplus/file/json/element/BlockScript.java

@@ -17,34 +17,20 @@
 
 import com.github.yuttyann.scriptblockplus.BlockCoords;
 import com.github.yuttyann.scriptblockplus.file.json.BaseElement;
-import com.github.yuttyann.scriptblockplus.file.json.annotation.Alternate;
-import com.github.yuttyann.scriptblockplus.script.ScriptKey;
 import com.google.gson.annotations.SerializedName;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * ScriptBlockPlus BlockScript クラス
  * @author yuttyann44581
  */
 public class BlockScript extends BaseElement {
 
-    @Alternate("scripttype")
-    @SerializedName(value = "scriptkey", alternate = { "scripttype" })
-    private final ScriptKey scriptKey;
-
     @SerializedName("scripts")
-    private final HashMap<BlockCoords, ScriptParam> scripts = new HashMap<>();
-
-    public BlockScript(@NotNull ScriptKey scriptKey) {
-        this.scriptKey = scriptKey;
-    }
-
-    @NotNull
-    public ScriptKey getScriptKey() {
-        return scriptKey;
-    }
+    private final Map<BlockCoords, ScriptParam> scripts = new HashMap<>();
 
     public boolean has(@NotNull BlockCoords blockCoords) {
         ScriptParam scriptParam = scripts.get(blockCoords);

src/main/java/com/github/yuttyann/scriptblockplus/script/ScriptKey.java

@@ -15,9 +15,7 @@
  */
 package com.github.yuttyann.scriptblockplus.script;
 
-import com.github.yuttyann.scriptblockplus.file.json.annotation.Exclude;
 import com.github.yuttyann.scriptblockplus.utils.StreamUtils;
-import com.google.gson.annotations.SerializedName;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -42,13 +40,9 @@ public final class ScriptKey implements Comparable<ScriptKey>, Serializable {
     public static final ScriptKey WALK = new ScriptKey("walk");
     public static final ScriptKey HIT = new ScriptKey("hit");
 
-    @Exclude
     private final String lowerName;
-
-    @SerializedName("name")
     private final String upperName;
 
-    @SerializedName("ordinal")
     private final int ordinal;
 
     /**