Skip to content

Commit bc9cbc9

Browse files
committed
migration to maven
1 parent c128d02 commit bc9cbc9

File tree

204 files changed

+916
-2351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+916
-2351
lines changed

.gitignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
*lib/
55
*test/
66
*dist/
7-
/MCPainter/nbproject/private/
8-
*genfiles.properties
7+
/MCPainter/nbproject/*
8+
*genfiles.properties
9+
/MCPainter/target/
10+
/MCPainter/test-server/*

MCPainter/src/INFO MCPainter/INFO

File renamed without changes.

MCPainter/src/TODO MCPainter/TODO

File renamed without changes.

MCPainter/licenseheader.txt

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<#if licenseFirst??>
2+
${licenseFirst}
3+
</#if>
4+
${licensePrefix}The MIT License
5+
${licensePrefix?replace(" +$", "", "r")}
6+
${licensePrefix}Copyright ${date?date?string("yyyy")} ${project.organization!user}.
7+
${licensePrefix?replace(" +$", "", "r")}
8+
${licensePrefix}Permission is hereby granted, free of charge, to any person obtaining a copy
9+
${licensePrefix}of this software and associated documentation files (the "Software"), to deal
10+
${licensePrefix}in the Software without restriction, including without limitation the rights
11+
${licensePrefix}to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
${licensePrefix}copies of the Software, and to permit persons to whom the Software is
13+
${licensePrefix}furnished to do so, subject to the following conditions:
14+
${licensePrefix?replace(" +$", "", "r")}
15+
${licensePrefix}The above copyright notice and this permission notice shall be included in
16+
${licensePrefix}all copies or substantial portions of the Software.
17+
${licensePrefix?replace(" +$", "", "r")}
18+
${licensePrefix}THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
${licensePrefix}IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
${licensePrefix}FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
${licensePrefix}AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
${licensePrefix}LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
${licensePrefix}OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
${licensePrefix}THE SOFTWARE.
25+
<#if licenseLast??>
26+
${licenseLast}
27+
</#if>

MCPainter/nb-configuration.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project-shared-configuration>
3+
<!--
4+
This file contains additional configuration written by modules in the NetBeans IDE.
5+
The configuration is intended to be shared among all the users of project and
6+
therefore it is assumed to be part of version control checkout.
7+
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
8+
-->
9+
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
10+
<!--
11+
Properties that influence various parts of the IDE, especially code formatting and the like.
12+
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
13+
That way multiple projects can share the same settings (useful for formatting rules for example).
14+
Any value defined here will override the pom.xml file value but is only applicable to the current project.
15+
-->
16+
<netbeans.hint.licensePath>${project.basedir}/licenseheader.txt</netbeans.hint.licensePath>
17+
</properties>
18+
</project-shared-configuration>

MCPainter/nbproject/build-impl.xml

-1,439
This file was deleted.

MCPainter/nbproject/project.properties

-98
This file was deleted.

MCPainter/nbproject/project.xml

-16
This file was deleted.

MCPainter/pom.xml

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>org.primesoft</groupId>
7+
<artifactId>MCPainter</artifactId>
8+
<version>1.1.0</version>
9+
10+
<packaging>jar</packaging>
11+
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<maven.compiler.source>1.8</maven.compiler.source>
15+
<maven.compiler.target>1.8</maven.compiler.target>
16+
</properties>
17+
18+
<repositories>
19+
<repository>
20+
<id>github-blockshub</id>
21+
<url>https://raw.githubusercontent.com/SBPrime/BlocksHub/maven-artifact/</url>
22+
</repository>
23+
24+
<repository>
25+
<id>sk89q</id>
26+
<url>http://maven.sk89q.com/artifactory/repo</url>
27+
</repository>
28+
29+
30+
</repositories>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>org.bukkit</groupId>
35+
<artifactId>bukkit</artifactId>
36+
<version>[1.12, 1.13)</version>
37+
<type>jar</type>
38+
</dependency>
39+
40+
<dependency>
41+
<groupId>com.sk89q.worldedit</groupId>
42+
<artifactId>worldedit-core</artifactId>
43+
<version>6.1</version>
44+
<type>jar</type>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.primesoft</groupId>
48+
<artifactId>BlocksHub</artifactId>
49+
<version>2.1.1</version>
50+
<type>jar</type>
51+
</dependency>
52+
<dependency>
53+
<groupId>net.milkbowl.vault</groupId>
54+
<artifactId>Vault</artifactId>
55+
<version>1.2.27</version>
56+
<type>jar</type>
57+
</dependency>
58+
<dependency>
59+
<groupId>commons-codec</groupId>
60+
<artifactId>commons-codec</artifactId>
61+
<version>1.9</version>
62+
<type>jar</type>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.sk89q.worldedit</groupId>
66+
<artifactId>worldedit-bukkit</artifactId>
67+
<version>6.1.5</version>
68+
<type>jar</type>
69+
</dependency>
70+
</dependencies>
71+
</project>

MCPainter/scrap/AssetBlock.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.Drawing.Blocks;
24+
package org.primesoft.mcpainter.drawing.blocks;
2525

2626
import com.sk89q.worldedit.LocalPlayer;
2727
import com.sk89q.worldedit.MaxChangedBlocksException;
2828
import com.sk89q.worldedit.Vector;
2929
import com.sk89q.worldedit.bukkit.BukkitPlayer;
3030
import java.util.HashMap;
31-
import org.PrimeSoft.MCPainter.Drawing.IColorMap;
32-
import org.PrimeSoft.MCPainter.blocksplacer.BlockLoger;
33-
import org.PrimeSoft.MCPainter.mods.assets.FacingBlock;
34-
import org.PrimeSoft.MCPainter.mods.assets.VariantKey;
35-
import org.PrimeSoft.MCPainter.utils.Orientation;
36-
import org.PrimeSoft.MCPainter.utils.Utils;
31+
import org.primesoft.mcpainter.drawing.IColorMap;
32+
import org.primesoft.mcpainter.blocksplacer.BlockLoger;
33+
import org.primesoft.mcpainter.mods.assets.FacingBlock;
34+
import org.primesoft.mcpainter.mods.assets.VariantKey;
35+
import org.primesoft.mcpainter.utils.Orientation;
36+
import org.primesoft.mcpainter.utils.Utils;
3737

3838
/**
3939
*

MCPainter/scrap/ColorPaletteRgb.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.Drawing.Filters;
24+
package org.primesoft.mcpainter.drawing.dilters;
2525

2626
/**
2727
*

MCPainter/scrap/DrawingBlockRGB.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.Drawing;
24+
package org.primesoft.mcpainter.drawing;
2525

2626
import com.sk89q.worldedit.MaxChangedBlocksException;
2727
import com.sk89q.worldedit.Vector;
2828
import com.sk89q.worldedit.extent.Extent;
2929
import java.util.ArrayList;
3030
import java.util.EnumSet;
3131
import java.util.List;
32-
import org.PrimeSoft.MCPainter.Configuration.OperationType;
33-
import org.PrimeSoft.MCPainter.blocksplacer.BlockLoger;
34-
import org.PrimeSoft.MCPainter.blocksplacer.ILoggerCommand;
32+
import org.primesoft.mcpainter.Configuration.OperationType;
33+
import org.primesoft.mcpainter.blocksplacer.BlockLoger;
34+
import org.primesoft.mcpainter.blocksplacer.ILoggerCommand;
3535
import org.bukkit.Chunk;
3636
import org.bukkit.DyeColor;
3737
import org.bukkit.Location;

MCPainter/scrap/MC3D/Buffer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.MC3D;
24+
package org.primesoft.mcpainter.MC3D;
2525

2626
import com.sk89q.worldedit.LocalPlayer;
2727
import java.awt.image.BufferedImage;
28-
import org.PrimeSoft.MCPainter.BlockLoger;
29-
import org.PrimeSoft.MCPainter.Configuration.OperationType;
30-
import org.PrimeSoft.MCPainter.Drawing.ColorMap;
31-
import org.PrimeSoft.MCPainter.Drawing.ImageHelper;
28+
import org.primesoft.mcpainter.BlockLoger;
29+
import org.primesoft.mcpainter.Configuration.OperationType;
30+
import org.primesoft.mcpainter.drawing.ColorMap;
31+
import org.primesoft.mcpainter.drawing.ImageHelper;
3232

3333
/**
3434
* Vertice buffer

MCPainter/scrap/MC3D/DoubleVertex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.MC3D;
24+
package org.primesoft.mcpainter.MC3D;
2525

2626
import com.sk89q.worldedit.BlockVector;
2727
import com.sk89q.worldedit.Vector;

MCPainter/scrap/MC3D/IntVertex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.MC3D;
24+
package org.primesoft.mcpainter.MC3D;
2525

2626
import com.sk89q.worldedit.BlockVector;
2727
import com.sk89q.worldedit.Vector;

MCPainter/scrap/MC3D/Utils3D.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.MC3D;
24+
package org.primesoft.mcpainter.MC3D;
2525

2626
import com.sk89q.worldedit.blocks.BaseBlock;
2727
import java.awt.Color;
2828
import java.util.ArrayList;
2929
import java.util.Arrays;
3030
import java.util.Comparator;
3131
import java.util.List;
32-
import org.PrimeSoft.MCPainter.BlockLoger;
33-
import org.PrimeSoft.MCPainter.Configuration.OperationType;
34-
import org.PrimeSoft.MCPainter.Drawing.ColorMap;
35-
import org.PrimeSoft.MCPainter.Drawing.ImageHelper;
32+
import org.primesoft.mcpainter.BlockLoger;
33+
import org.primesoft.mcpainter.Configuration.OperationType;
34+
import org.primesoft.mcpainter.drawing.ColorMap;
35+
import org.primesoft.mcpainter.drawing.ImageHelper;
3636

3737
/**
3838
* Util functions used for drawing 3d primitives

MCPainter/scrap/MC3D/Vertex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24-
package org.PrimeSoft.MCPainter.MC3D;
24+
package org.primesoft.mcpainter.MC3D;
2525

2626
/**
2727
* This class represents a 3D vertex

0 commit comments

Comments
 (0)