Skip to content

Commit f304612

Browse files
committed
Rebranding and minimization for base of project
1 parent 79639fc commit f304612

File tree

494 files changed

+2616
-2580
lines changed

Some content is hidden

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

494 files changed

+2616
-2580
lines changed

.gitattributes

-17
This file was deleted.

.gitignore

+22-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1-
/*
2-
!/src/
3-
!.gitignore
4-
!gradlew*
5-
!/gradle/
6-
!/LICENSE.txt
7-
!/README.md
8-
!build.gradle
9-
!.travis.yml
10-
!/textures/
11-
!/gradle.properties
12-
!.gitattributes
13-
!ASSETS_LICENSE.txt
1+
# eclipse
2+
bin
3+
*.launch
4+
.settings
5+
.metadata
6+
.classpath
7+
.project
8+
9+
# idea
10+
out
11+
*.ipr
12+
*.iws
13+
*.iml
14+
.idea
15+
16+
# gradle
17+
build
18+
.gradle
19+
20+
# other
21+
eclipse
22+
run

LICENSE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#The MIT License (MIT)
2+
3+
Copyright (c) 2016
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.txt

-23
This file was deleted.

README.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
# Test Mod 3
2-
This is Minecraft Forge 1.10.2 mod that I use to test various things (mainly code for people in the Minecraft Forum [Modification Development](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/modification-development) section and the Minecraft Forge [Modder Support](http://www.minecraftforge.net/forum/index.php/board,73.0.html) section).
1+
#[Aqua Regia](http://minecraft.curseforge.com/projects/aqua-regia)
32

4-
It's not supposed to be a complete or working mod.
3+
For Minecraft 1.10.2
4+
5+
##Licenses
6+
Code, Textures and binaries are licensed under the MIT License.
7+
8+
You are allowed to use the mod in your modpack.
9+
10+
Any alternate licenses are noted where appropriate.
11+
12+
##Thanks
13+
Based on the examples from https://github.com/Choonster/TestMod3

build.gradle

+9-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,14 @@ minecraft {
4040
}
4141

4242
repositories {
43-
maven { url = "http://dvs1.progwml6.com/files/maven" }
44-
maven { url = "http://mobiusstrip.eu/maven" }
43+
maven { // The repo from which to get jei
44+
name "Progwm Repo"
45+
url "http://dvs1.progwml6.com/files/maven"
46+
}
47+
maven { // The repo from which to get waila
48+
name "Mobius Repo"
49+
url "http://mobiusstrip.eu/maven"
50+
}
4551
}
4652

4753
dependencies {
@@ -57,7 +63,7 @@ shadowJar {
5763
}
5864

5965
// Relocate fluent-hc to prevent conflicts with other mods that include it
60-
relocate 'org.apache.http.client.fluent', 'choonster.testmod3.repack.org.apache.http.client.fluent'
66+
relocate 'org.apache.http.client.fluent', 'droidicus.aquaregia.repack.org.apache.http.client.fluent'
6167

6268
classifier '' // Replace the default JAR
6369
}

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
mod_name=TestMod3
2-
package_group=choonster.testmod3
1+
mod_name=AquaRegia
2+
package_group=droidicus.aquiaregia
33

44
mc_version=1.10.2
55
forge_version=12.18.1.2076
@@ -11,4 +11,4 @@ waila_version=1.7.0-B3
1111
# Minecraft uses Apache HTTP Client 4.3.3, so we have to use the same version of the Fluent API
1212
httpclient_version=4.3.3
1313

14-
mod_version=3.1
14+
mod_version=0.0.1

gradle/wrapper/gradle-wrapper.jar

-1.33 KB
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 12 02:30:23 AEDT 2015
1+
#Sun Sep 04 11:31:57 EDT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

gradlew

+7-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ case "`uname`" in
4242
;;
4343
esac
4444

45+
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46+
if $cygwin ; then
47+
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48+
fi
49+
4550
# Attempt to set APP_HOME
4651
# Resolve links: $0 may be a link
4752
PRG="$0"
@@ -56,9 +61,9 @@ while [ -h "$PRG" ] ; do
5661
fi
5762
done
5863
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
64+
cd "`dirname \"$PRG\"`/" >&-
6065
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
66+
cd "$SAVED" >&-
6267

6368
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6469

@@ -109,7 +114,6 @@ fi
109114
if $cygwin ; then
110115
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111116
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112-
JAVACMD=`cygpath --unix "$JAVACMD"`
113117

114118
# We build the pattern for arguments to be converted via cygpath
115119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

src/main/java/choonster/testmod3/capability/hiddenblockrevealer/package-info.java

-7
This file was deleted.

src/main/java/choonster/testmod3/capability/pigspawner/package-info.java

-7
This file was deleted.

src/main/java/choonster/testmod3/client/cape/package-info.java

-7
This file was deleted.

src/main/java/choonster/testmod3/client/event/package-info.java

-7
This file was deleted.

src/main/java/choonster/testmod3/client/model/package-info.java

-7
This file was deleted.

src/main/java/choonster/testmod3/client/render/entity/package-info.java

-7
This file was deleted.

src/main/java/choonster/testmod3/entity/EntityModArrow.java

-62
This file was deleted.

0 commit comments

Comments
 (0)