From abe19bb6dc8ffc6641b45f4ba0cfab56a72176ef Mon Sep 17 00:00:00 2001
From: Ponpon <nepon_109@yahoo.co.jp>
Date: Sat, 28 Dec 2024 19:52:42 +0900
Subject: [PATCH] =?UTF-8?q?effects=20->=20effect=20=E3=81=AE=E5=90=8D?=
 =?UTF-8?q?=E5=89=8D=E5=A4=89=E6=9B=B4=E5=BF=98=E3=82=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#644)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/effect/advancement/bad_effects.json    |  2 +-
 data/effect/advancement/invisible.json      |  2 +-
 data/effect/predicate/too_bad_effect.json   | 22 ++++++++++-----------
 data/player/function/ten_seconds.mcfunction |  3 +++
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/data/effect/advancement/bad_effects.json b/data/effect/advancement/bad_effects.json
index 2650ee151..a9917f7c0 100644
--- a/data/effect/advancement/bad_effects.json
+++ b/data/effect/advancement/bad_effects.json
@@ -140,6 +140,6 @@
     ["nausea","poison","weakness","wither","blindness","hunger","mining_fatigue","slowness","darkness"]
   ],
   "rewards": {
-    "function": "effects:bad_effects"
+    "function": "effect:bad_effects"
   }
 }
diff --git a/data/effect/advancement/invisible.json b/data/effect/advancement/invisible.json
index a505df05b..5b726ee11 100644
--- a/data/effect/advancement/invisible.json
+++ b/data/effect/advancement/invisible.json
@@ -333,6 +333,6 @@
     ["default"]
   ],
   "rewards": {
-    "function": "effects:invisible/trigger"
+    "function": "effect:invisible/trigger"
   }
 }
diff --git a/data/effect/predicate/too_bad_effect.json b/data/effect/predicate/too_bad_effect.json
index 4f7f0ebbe..6c473e636 100644
--- a/data/effect/predicate/too_bad_effect.json
+++ b/data/effect/predicate/too_bad_effect.json
@@ -8,7 +8,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "doom": true
             }
           }
@@ -22,7 +22,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "super_doom": true
             }
           }
@@ -36,7 +36,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "burn": true
             }
           }
@@ -50,7 +50,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "freeze": true
             }
           }
@@ -64,7 +64,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "palsy": true
             }
           }
@@ -78,7 +78,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "confuse": true
             }
           }
@@ -92,7 +92,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "curse": true
             }
           }
@@ -106,7 +106,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "virus": true
             }
           }
@@ -120,7 +120,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "tnt": true
             }
           }
@@ -134,7 +134,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "pale": true
             }
           }
@@ -148,7 +148,7 @@
         "type_specific": {
           "type": "player",
           "advancements": {
-            "effects:invisible": {
+            "effect:invisible": {
               "debility": true
             }
           }
diff --git a/data/player/function/ten_seconds.mcfunction b/data/player/function/ten_seconds.mcfunction
index ccde1a3cb..f6d82eed1 100644
--- a/data/player/function/ten_seconds.mcfunction
+++ b/data/player/function/ten_seconds.mcfunction
@@ -1,3 +1,6 @@
 #> player:ten_seconds
 # -> 1分処理
 execute if score $TenSeconds Count matches 0 run function player:one_minute
+
+#透明化付与
+function effect:invisible/wearable_invisible