Skip to content

Commit b4c0e8a

Browse files
MarcusSloverMarcusSlover
authored
Merge pull request #16 from MarcusSlover/dev
Dev
2 parents b678e54 + 1234699 commit b4c0e8a

58 files changed

Lines changed: 218 additions & 75 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2424
hs_err_pid*
2525

26+
/.idea/
27+
/build/
28+
29+

‎build.gradle‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,18 @@ plugins {
3030
}
3131

3232
group 'me.marcusslover'
33-
version 'b1.2'
33+
version 'b1.3'
3434

3535
sourceCompatibility = JavaVersion.VERSION_1_8
3636
targetCompatibility = JavaVersion.VERSION_1_8
3737

38+
tasks.build.dependsOn tasks.shadowJar
39+
40+
tasks.withType(JavaCompile) {
41+
options.warnings = false
42+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
43+
}
44+
3845
repositories {
3946
mavenCentral()
4047
}
@@ -65,9 +72,10 @@ shadowJar {
6572
archiveFileName = "ResourcePacker-${version}.jar"
6673

6774
manifest {
68-
attributes 'Implementation-Title': 'ResourcePacker',
75+
attributes('Implementation-Title': 'ResourcePacker',
6976
'Implementation-Version': version,
7077
'Main-Class': 'me.marcusslover.resourcepacker.core.packer.Core'
78+
)
7179
}
7280
}
7381

@@ -107,3 +115,4 @@ publishing {
107115

108116
}
109117

118+

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
#
2+
# MIT License
3+
#
4+
# Copyright (c) 2022 MarcusSlover
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all
14+
# copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
#
24+
#
25+
126
distributionBase=GRADLE_USER_HOME
227
distributionPath=wrapper/dists
328
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip

‎gradlew‎

Lines changed: 19 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/me/marcusslover/resourcepacker/ResourcePacker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal

‎src/main/java/me/marcusslover/resourcepacker/api/IBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal

‎src/main/java/me/marcusslover/resourcepacker/api/IData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal

‎src/main/java/me/marcusslover/resourcepacker/api/IFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal

‎src/main/java/me/marcusslover/resourcepacker/api/IFile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal

‎src/main/java/me/marcusslover/resourcepacker/api/IFont.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MIT License
33
*
4-
* Copyright (c) 2021 MarcusSlover
4+
* Copyright (c) 2022 MarcusSlover
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)