Skip to content

Commit

Permalink
change project name
Browse files Browse the repository at this point in the history
  • Loading branch information
merykitty committed Apr 12, 2021
1 parent 0f52a23 commit e2a0d4c
Show file tree
Hide file tree
Showing 71 changed files with 282 additions and 291 deletions.
16 changes: 9 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion>

<groupId>io.github.merykitty</groupId>
<artifactId>slp-processor</artifactId>
<artifactId>meryslp</artifactId>
<version>0.0.1</version>

<name>slp-processor</name>
<name>meryslp</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>

Expand All @@ -27,6 +27,7 @@
<project.resources.input>${project.basedir}/src/main/resources</project.resources.input>
<project.resources.input.common>${project.resources.input}/common</project.resources.input.common>
<project.resources.output>${project.basedir}/resources</project.resources.output>
<user.exec.name>MerySLP</user.exec.name>
</properties>

<dependencies>
Expand Down Expand Up @@ -67,7 +68,7 @@
</fileset>

<fileset>
<directory>SLPProcessor</directory>
<directory>${user.exec.name}</directory>
</fileset>
</filesets>
</configuration>
Expand All @@ -90,12 +91,13 @@
</goals>
<phase>package</phase>
<configuration>
<outputDirectory>${project.basedir}/SLPProcessor/resources</outputDirectory>
<outputDirectory>${project.basedir}/${user.exec.name}/resources</outputDirectory>
<resources>
<resource>
<directory>${project.resources.output}</directory>
<excludes>
<exclude>*.properties</exclude>
<exclude>*.ico</exclude>
</excludes>
<filtering>false</filtering>
</resource>
Expand Down Expand Up @@ -145,11 +147,11 @@
<argument>-d</argument>
<argument>${project.basedir}</argument>
<argument>-n</argument>
<argument>SLPProcessor</argument>
<argument>${user.exec.name}</argument>
<argument>-p</argument>
<modulepath/>
<argument>-m</argument>
<argument>io.github.merykitty.slpprocessor/io.github.merykitty.slpprocessor.Info</argument>
<argument>io.github.merykitty.meryslp/io.github.merykitty.meryslp.Info</argument>
<argument>--add-launcher</argument>
<argument>SLPDecoder=${project.resources.output}/decoder.properties</argument>
<argument>--add-launcher</argument>
Expand Down Expand Up @@ -186,7 +188,7 @@
<classpath/>
<argument>-cp</argument>
<classpath/>
<argument>io.github.merykitty.slpprocessor.Test</argument>
<argument>io.github.merykitty.meryslp.Test</argument>
</arguments>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.merykitty.slpprocessor;
package io.github.merykitty.meryslp;

public class Info {
public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package io.github.merykitty.slpprocessor;
package io.github.merykitty.meryslp;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

import io.github.merykitty.slpprocessor.misc.EnvironmentResolver;
import io.github.merykitty.slpprocessor.misc.PrimitiveOptional;
import io.github.merykitty.meryslp.misc.EnvironmentResolver;
import io.github.merykitty.meryslp.misc.PrimitiveOptional;
import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.Namespace;

import io.github.merykitty.slpprocessor.common.SLPFiles;
import io.github.merykitty.slpprocessor.image.PaletteContainer;
import io.github.merykitty.meryslp.common.SLPFiles;
import io.github.merykitty.meryslp.image.PaletteContainer;

public class SLPDecoder {
private static final Path DEFAULT_CONFIG_FILE = Path.of("resources/aoe1-config.json");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.github.merykitty.slpprocessor;
package io.github.merykitty.meryslp;

import io.github.merykitty.slpprocessor.common.SLPFiles;
import io.github.merykitty.slpprocessor.image.PaletteContainer;
import io.github.merykitty.slpprocessor.misc.EnvironmentResolver;
import io.github.merykitty.slpprocessor.misc.PrimitiveOptional;
import io.github.merykitty.meryslp.common.SLPFiles;
import io.github.merykitty.meryslp.image.PaletteContainer;
import io.github.merykitty.meryslp.misc.EnvironmentResolver;
import io.github.merykitty.meryslp.misc.PrimitiveOptional;
import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.Namespace;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.merykitty.slpprocessor;
package io.github.merykitty.meryslp;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

import io.github.merykitty.slpprocessor.common.SLPFiles;
import io.github.merykitty.slpprocessor.image.PaletteContainer;
import io.github.merykitty.slpprocessor.misc.EnvironmentResolver;
import io.github.merykitty.meryslp.common.SLPFiles;
import io.github.merykitty.meryslp.image.PaletteContainer;
import io.github.merykitty.meryslp.misc.EnvironmentResolver;

public class Test {
private static final Path HOME_DIR = EnvironmentResolver.homeDir();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.merykitty.slpprocessor.command;
package io.github.merykitty.meryslp.command;

import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import jdk.incubator.foreign.MemorySegment;

public interface Command {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.github.merykitty.slpprocessor.command;
package io.github.merykitty.meryslp.command;

import io.github.merykitty.slpprocessor.image.*;
import io.github.merykitty.slpprocessor.misc.CommandResolveResult;
import io.github.merykitty.slpprocessor.misc.SecCommandResolveResult;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.image.*;
import io.github.merykitty.meryslp.misc.CommandResolveResult;
import io.github.merykitty.meryslp.misc.SecCommandResolveResult;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

import io.github.merykitty.slpprocessor.command.impl.*;
import io.github.merykitty.meryslp.command.impl.*;

public class Commands {
private static final byte MASK = 0x0f;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.merykitty.slpprocessor.command;
package io.github.merykitty.meryslp.command;

@__primitive__
public class DrawCursor {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.merykitty.slpprocessor.command;
package io.github.merykitty.meryslp.command;

import io.github.merykitty.slpprocessor.image.SecFrameType;
import io.github.merykitty.slpprocessor.image.SecondaryArtboard;
import io.github.merykitty.meryslp.image.SecFrameType;
import io.github.merykitty.meryslp.image.SecondaryArtboard;
import jdk.incubator.foreign.MemorySegment;

public interface SecondaryCommand {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.*;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.*;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.slpprocessor.image.PxPlayerColour;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import io.github.merykitty.meryslp.image.PxPlayerColour;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.*;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.*;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.*;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.*;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.merykitty.slpprocessor.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.slpprocessor.misc.ubyte;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.github.merykitty.slpprocessor.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.slpprocessor.image.PxPlayerColour;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import io.github.merykitty.meryslp.image.PxPlayerColour;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.slpprocessor.image.PxPlayerColour;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.Commands;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import io.github.merykitty.meryslp.image.PxPlayerColour;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.Artboard;
import io.github.merykitty.slpprocessor.image.Palette;
import io.github.merykitty.slpprocessor.image.PxColourValueType;
import io.github.merykitty.slpprocessor.image.PxPlayerColour;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.Artboard;
import io.github.merykitty.meryslp.image.Palette;
import io.github.merykitty.meryslp.image.PxColourValueType;
import io.github.merykitty.meryslp.image.PxPlayerColour;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package io.github.merykitty.slpprocessor.command.impl;
package io.github.merykitty.meryslp.command.impl;

import io.github.merykitty.slpprocessor.command.Command;
import io.github.merykitty.slpprocessor.command.Commands;
import io.github.merykitty.slpprocessor.command.DrawCursor;
import io.github.merykitty.slpprocessor.image.*;
import io.github.merykitty.slpprocessor.misc.ubyte;
import io.github.merykitty.meryslp.command.Command;
import io.github.merykitty.meryslp.command.DrawCursor;
import io.github.merykitty.meryslp.image.*;
import io.github.merykitty.meryslp.misc.ubyte;
import jdk.incubator.foreign.MemoryAccess;
import jdk.incubator.foreign.MemorySegment;

Expand Down
Loading

0 comments on commit e2a0d4c

Please sign in to comment.