From aad12650ea7394e315ebe170ceebb345c739577d Mon Sep 17 00:00:00 2001
From: Runemoro
Date: Sat, 18 Apr 2020 09:02:12 -0400
Subject: Fix a few bugs (#219)

* Update Gradle and replace deprecated Gradle features

* Allow naming class in default package (fixes #215)

* Fix CFR crash (fixes #207)

* Update README.md

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>---
 src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/translation/mapping')

diff --git a/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java b/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java
index 19473ea..5bc2f67 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java
@@ -26,7 +26,7 @@ public class NameValidator {
 			"boolean", "do", "if", "private", "this", "break", "double", "implements", "protected", "throw", "byte",
 			"else", "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch",
 			"extends", "int", "short", "try", "char", "final", "interface", "static", "void", "class", "finally",
-			"long", "strictfp", "volatile", "const", "float", "native", "super", "while"
+			"long", "strictfp", "volatile", "const", "float", "native", "super", "while", "_"
 	);
 
 	static {
@@ -35,13 +35,10 @@ public class NameValidator {
 		CLASS_PATTERN = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex));
 	}
 
-	public static void validateClassName(String name, boolean packageRequired) {
+	public static void validateClassName(String name) {
 		if (!CLASS_PATTERN.matcher(name).matches() || ILLEGAL_IDENTIFIERS.contains(name)) {
 			throw new IllegalNameException(name, "This doesn't look like a legal class name");
 		}
-		if (packageRequired && ClassEntry.getPackageName(name) == null) {
-			throw new IllegalNameException(name, "Class must be in a package");
-		}
 	}
 
 	public static void validateIdentifier(String name) {
-- 
cgit v1.2.3