Refactor negated pattern variables

#476 (comment)
JorelAli · Aug 14, 2023 · 0d08647 · 0d08647
1 parent 5f6ca11
commit 0d08647
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 42 deletions.
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/CommandAPIHandler.java b/commandapi-core/src/main/java/dev/jorel/commandapi/CommandAPIHandler.java
@@ -821,13 +821,16 @@ <T, EI> ArgumentType<T> wrapArgumentType(Argument argument, ArgumentType<T> rawT
  return wrapArgumentType(((WrapperArgument<Argument>) argument).getBaseArgument(), rawType);
  }
 
- if (!(argument instanceof InitialParseExceptionArgument)) return rawType;
+ if (argument instanceof InitialParseExceptionArgument) {
+ InitialParseExceptionArgument<T, EI, ?> iPEA = (InitialParseExceptionArgument<T, EI, ?>) argument.instance();
+ Optional<InitialParseExceptionHandler<T, EI>> handler = iPEA.getInitialParseExceptionHandler();
 
- InitialParseExceptionArgument<T, EI, ?> iPEA = (InitialParseExceptionArgument<T, EI, ?>) argument.instance();
+ if (handler.isPresent()) {
+ return new ExceptionHandlingArgumentType<>(rawType, handler.get(), iPEA::parseInitialParseException);
+ }
+ }
 
- Optional<InitialParseExceptionHandler<T, EI>> handler = iPEA.getInitialParseExceptionHandler();
- if (handler.isEmpty()) return rawType;
- return new ExceptionHandlingArgumentType<>(rawType, handler.get(), iPEA::parseInitialParseException);
+ return rawType;
  }
 
  CommandArguments generatePreviousArguments(CommandContext<Source> context, Argument[] args, String nodeName)

diff --git a/...pi-bukkit-nms/commandapi-bukkit-1.15/src/main/java/dev/jorel/commandapi/nms/NMS_1_15.java b/...pi-bukkit-nms/commandapi-bukkit-1.15/src/main/java/dev/jorel/commandapi/nms/NMS_1_15.java
@@ -987,8 +987,6 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof ChatMessage chat)) return null;
-
- return chat.getKey();
+ return (message instanceof ChatMessage chat) ? chat.getKey() : null;
  }
 }
diff --git a/...kkit-nms/commandapi-bukkit-1.16.1/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R1.java b/...kkit-nms/commandapi-bukkit-1.16.1/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R1.java
@@ -1064,8 +1064,6 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof ChatMessage chat)) return null;
-
- return chat.getKey();
+ return (message instanceof ChatMessage chat) ? chat.getKey() : null;
  }
 }
diff --git a/...kkit-nms/commandapi-bukkit-1.16.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R2.java b/...kkit-nms/commandapi-bukkit-1.16.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R2.java
@@ -1049,8 +1049,6 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof ChatMessage chat)) return null;
-
- return chat.getKey();
+ return (message instanceof ChatMessage chat) ? chat.getKey() : null;
  }
 }
diff --git a/...it-nms/commandapi-bukkit-1.16.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_4_R3.java b/...it-nms/commandapi-bukkit-1.16.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_4_R3.java
@@ -1002,8 +1002,6 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof ChatMessage chat)) return null;
-
- return chat.getKey();
+ return (message instanceof ChatMessage chat) ? chat.getKey() : null;
  }
 }
diff --git a/...commandapi-bukkit-1.17-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_17_Common.java b/...commandapi-bukkit-1.17-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_17_Common.java
@@ -698,9 +698,7 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof TranslatableComponent chat)) return null;
-
- return chat.getKey();
+ return (message instanceof TranslatableComponent chat) ? chat.getKey() : null;
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...kkit-nms/commandapi-bukkit-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java b/...kkit-nms/commandapi-bukkit-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java
@@ -860,9 +860,7 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof TranslatableComponent chat)) return null;
-
- return chat.getKey();
+ return (message instanceof TranslatableComponent chat) ? chat.getKey() : null;
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...bukkit-nms/commandapi-bukkit-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java b/...bukkit-nms/commandapi-bukkit-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java
@@ -736,9 +736,7 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof TranslatableComponent chat)) return null;
-
- return chat.getKey();
+ return (message instanceof TranslatableComponent chat) ? chat.getKey() : null;
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...commandapi-bukkit-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java b/...commandapi-bukkit-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java
@@ -916,12 +916,16 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof MutableComponent component)) return null;
 
- ComponentContents contents = component.getContents();
- if(!(contents instanceof TranslatableContents translatableContents)) return null;
+ if (message instanceof MutableComponent component) {
+  ComponentContents contents = component.getContents();
 
- return translatableContents.getKey();
+ if (contents instanceof TranslatableContents translatableContents) {
+ return translatableContents.getKey();
+ }
+ }
+
+ return null;
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...it-nms/commandapi-bukkit-1.19.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_3_R2.java b/...it-nms/commandapi-bukkit-1.19.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_3_R2.java
@@ -810,12 +810,16 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof MutableComponent component)) return null;
 
- ComponentContents contents = component.getContents();
- if(!(contents instanceof TranslatableContents translatableContents)) return null;
+ if (message instanceof MutableComponent component) {
+  ComponentContents contents = component.getContents();
 
- return translatableContents.getKey();
+ if (contents instanceof TranslatableContents translatableContents) {
+ return translatableContents.getKey();
+ }
+ }
+
+ return null;
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...it-nms/commandapi-bukkit-1.19.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_4_R3.java b/...it-nms/commandapi-bukkit-1.19.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_4_R3.java
@@ -796,12 +796,16 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof MutableComponent component)) return null;
 
- ComponentContents contents = component.getContents();
- if(!(contents instanceof TranslatableContents translatableContents)) return null;
+ if (message instanceof MutableComponent component) {
+  ComponentContents contents = component.getContents();
 
- return translatableContents.getKey();
+ if (contents instanceof TranslatableContents translatableContents) {
+ return translatableContents.getKey();
+ }
+ }
+
+ return null;
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...bukkit-nms/commandapi-bukkit-1.20/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R1.java b/...bukkit-nms/commandapi-bukkit-1.20/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R1.java
@@ -796,12 +796,16 @@ public String extractTranslationKey(CommandSyntaxException exception) {
  // which has a repeated structure that holds the translation key
  // It might work for other exception sources ¯\_(ツ)_/¯
  Message message = exception.getRawMessage();
- if(!(message instanceof MutableComponent component)) return null;
 
- ComponentContents contents = component.getContents();
- if(!(contents instanceof TranslatableContents translatableContents)) return null;
+ if (message instanceof MutableComponent component) {
+  ComponentContents contents = component.getContents();
 
- return translatableContents.getKey();
+ if (contents instanceof TranslatableContents translatableContents) {
+ return translatableContents.getKey();
+ }
+ }
+
+ return null;
  }
 
  @SuppressWarnings("unchecked")