Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename package to org.quiltmc.enigma #153

Merged
merged 8 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ We'll only be cataloguing major changes, since there are countless bug fixes to

- added multiplayer support
- reworked gradle setup
- changed package from `cuchaz.enigma` to `org.quiltmc.enigma`

### enigma

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Pre-compiled jars can be found on the [Quilt maven](https://maven.quiltmc.org/re

### On the command line

`java -cp enigma.jar cuchaz.enigma.command.Main`
`java -cp enigma.jar command.org.quiltmc.enigma.Main`
ix0rai marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<!-- Ensure all imports are ship shape -->
<module name="AvoidStarImport">
<property name="excludes" value="org.hamcrest.Matchers,cuchaz.enigma.TestEntryFactory"/>
<property name="excludes" value="org.hamcrest.Matchers,org.quiltmc.enigma.TestEntryFactory"/>
</module>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
Expand Down
2 changes: 1 addition & 1 deletion enigma-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
testImplementation(testFixtures(project(':enigma')))
}

mainClassName = 'cuchaz.enigma.command.Main'
mainClassName = 'org.quiltmc.enigma.command.Main'

jar.manifest.attributes 'Main-Class': mainClassName

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

public enum Argument {
INPUT_JAR("<input-jar>",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.analysis.index.JarIndex;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.EnigmaProject;
import org.quiltmc.enigma.analysis.index.JarIndex;
import org.quiltmc.enigma.translation.representation.entry.ClassEntry;
import org.tinylog.Logger;

import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package cuchaz.enigma.command;

import cuchaz.enigma.Enigma;
import cuchaz.enigma.EnigmaProfile;
import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.analysis.index.JarIndex;
import cuchaz.enigma.api.EnigmaPlugin;
import cuchaz.enigma.classprovider.CachingClassProvider;
import cuchaz.enigma.classprovider.ClasspathClassProvider;
import cuchaz.enigma.classprovider.JarClassProvider;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.MappingDelta;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.tree.DeltaTrackingTree;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.Enigma;
import org.quiltmc.enigma.EnigmaProfile;
import org.quiltmc.enigma.EnigmaProject;
import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.analysis.index.JarIndex;
import org.quiltmc.enigma.api.EnigmaPlugin;
import org.quiltmc.enigma.classprovider.CachingClassProvider;
import org.quiltmc.enigma.classprovider.ClasspathClassProvider;
import org.quiltmc.enigma.classprovider.JarClassProvider;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.MappingDelta;
import org.quiltmc.enigma.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.tree.DeltaTrackingTree;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.tinylog.Logger;

import java.io.BufferedWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package cuchaz.enigma.command;

import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.translation.mapping.MappingOperations;
import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.utils.Utils;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.translation.mapping.MappingOperations;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.serde.MappingFileNameFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.utils.Utils;

import java.io.IOException;
import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

public record ComposedArgument(Argument argument, boolean optional) {
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package cuchaz.enigma.command;

import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.utils.Utils;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.serde.MappingFileNameFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.utils.Utils;

import java.io.IOException;
import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.EnigmaProject.DecompileErrorStrategy;
import cuchaz.enigma.source.DecompilerService;
import cuchaz.enigma.source.Decompilers;
import org.quiltmc.enigma.EnigmaProject;
import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.EnigmaProject.DecompileErrorStrategy;
import org.quiltmc.enigma.source.DecompilerService;
import org.quiltmc.enigma.source.Decompilers;
import org.tinylog.Logger;

import java.lang.reflect.Field;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.ProgressListener;
import org.quiltmc.enigma.EnigmaProject;
import org.quiltmc.enigma.ProgressListener;

import java.nio.file.Path;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.EnigmaProject;
import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.tinylog.Logger;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package cuchaz.enigma.command;

import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.analysis.index.JarIndex;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.DeltaTrackingTree;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import cuchaz.enigma.translation.representation.entry.ParentedEntry;
import cuchaz.enigma.utils.Utils;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.analysis.index.JarIndex;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.serde.MappingFileNameFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.tree.DeltaTrackingTree;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.translation.mapping.tree.EntryTreeNode;
import org.quiltmc.enigma.translation.mapping.tree.HashEntryTree;
import org.quiltmc.enigma.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.translation.representation.entry.ParentedEntry;
import org.quiltmc.enigma.utils.Utils;
import org.tinylog.Logger;

import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import org.tinylog.Logger;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
package cuchaz.enigma.command;

import cuchaz.enigma.Enigma;
import cuchaz.enigma.EnigmaProfile;
import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.analysis.index.EntryIndex;
import cuchaz.enigma.api.EnigmaPlugin;
import cuchaz.enigma.api.service.NameProposalService;
import cuchaz.enigma.translation.ProposingTranslator;
import cuchaz.enigma.translation.Translator;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.EntryRemapper;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.DeltaTrackingTree;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
import cuchaz.enigma.translation.representation.TypeDescriptor;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.FieldEntry;
import cuchaz.enigma.translation.representation.entry.LocalVariableEntry;
import cuchaz.enigma.translation.representation.entry.MethodEntry;
import cuchaz.enigma.utils.Utils;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.Enigma;
import org.quiltmc.enigma.EnigmaProfile;
import org.quiltmc.enigma.EnigmaProject;
import org.quiltmc.enigma.ProgressListener;
import org.quiltmc.enigma.analysis.index.EntryIndex;
import org.quiltmc.enigma.api.EnigmaPlugin;
import org.quiltmc.enigma.api.service.NameProposalService;
import org.quiltmc.enigma.translation.ProposingTranslator;
import org.quiltmc.enigma.translation.Translator;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.EntryRemapper;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.tree.DeltaTrackingTree;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.translation.mapping.tree.HashEntryTree;
import org.quiltmc.enigma.translation.representation.TypeDescriptor;
import org.quiltmc.enigma.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.translation.representation.entry.Entry;
import org.quiltmc.enigma.translation.representation.entry.FieldEntry;
import org.quiltmc.enigma.translation.representation.entry.LocalVariableEntry;
import org.quiltmc.enigma.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.utils.Utils;
import org.tinylog.Logger;

import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package cuchaz.enigma.command;

import cuchaz.enigma.translation.mapping.MappingOperations;
import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.utils.Utils;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.translation.mapping.MappingOperations;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.serde.MappingFileNameFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.utils.Utils;

import java.io.IOException;
import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.Enigma;
import org.quiltmc.enigma.Enigma;
import org.tinylog.Logger;

import java.util.LinkedHashMap;
Expand Down Expand Up @@ -61,7 +61,7 @@ private static void printHelp() {
StringBuilder help = new StringBuilder();
help.append("""
Usage:
\tjava -cp enigma.jar cuchaz.enigma.command.CommandMain <command> <args>
\tjava -cp enigma.jar org.quiltmc.enigma.command.CommandMain <command> <args>
\twhere <command> is one of:""");

for (Command command : COMMANDS.values()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package cuchaz.enigma.command;

import cuchaz.enigma.analysis.index.BridgeMethodIndex;
import cuchaz.enigma.analysis.index.JarIndex;
import cuchaz.enigma.translation.MappingTranslator;
import cuchaz.enigma.translation.Translator;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.tree.DeltaTrackingTree;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
import cuchaz.enigma.translation.representation.entry.MethodEntry;
import cuchaz.enigma.utils.Utils;
package org.quiltmc.enigma.command;

import org.quiltmc.enigma.analysis.index.BridgeMethodIndex;
import org.quiltmc.enigma.analysis.index.JarIndex;
import org.quiltmc.enigma.translation.MappingTranslator;
import org.quiltmc.enigma.translation.Translator;
import org.quiltmc.enigma.translation.mapping.EntryMapping;
import org.quiltmc.enigma.translation.mapping.serde.MappingFileNameFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.tree.DeltaTrackingTree;
import org.quiltmc.enigma.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.translation.mapping.tree.EntryTreeNode;
import org.quiltmc.enigma.translation.mapping.tree.HashEntryTree;
import org.quiltmc.enigma.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.utils.Utils;

import java.io.IOException;
import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.translation.mapping.serde.MappingFormat;
import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
import org.quiltmc.enigma.translation.mapping.serde.MappingFormat;
import org.quiltmc.enigma.translation.mapping.serde.MappingsWriter;
import org.quiltmc.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;

public final class MappingCommandsUtil {
private MappingCommandsUtil() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package cuchaz.enigma.command;
package org.quiltmc.enigma.command;

import cuchaz.enigma.TestUtil;
import org.quiltmc.enigma.TestUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.nio.file.Path;

public class CheckMappingsCommandTest extends CommandTest {
private static final Path JAR = TestUtil.obfJar("packageAccess");
private static final Path JAR = TestUtil.obfJar("package_access");
private static final Path WRONG_MAPPINGS = getResource("/packageAccess/wrongMappings");
private static final Path CORRECT_MAPPINGS = getResource("/packageAccess/correctMappings");

Expand Down
Loading