Skip to content

Commit f1453c8

Browse files
committed
Bump up Gradle version
1 parent 414a042 commit f1453c8

11 files changed

Lines changed: 331 additions & 168 deletions

File tree

.editorconfig

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
indent_size = 4
9+
indent_style = tab
10+
tab_width = 4
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
13+
max_line_length = 160
14+
# IDEA
15+
ij_java_space_before_if_parentheses = true
16+
ij_java_space_before_for_parentheses = true
17+
ij_java_space_before_try_parentheses = true
18+
ij_java_space_before_catch_parentheses = true
19+
ij_java_space_before_while_parentheses = true
20+
ij_java_space_before_switch_parentheses = true
21+
ij_java_space_before_synchronized_parentheses = true
22+
ij_java_space_after_type_cast = true
23+
ij_java_spaces_within_array_initializer_braces = true
24+
ij_java_space_before_array_initializer_left_brace = true
25+
ij_java_class_brace_style = next_line
26+
ij_java_method_brace_style = next_line
27+
ij_java_block_brace_style = next_line
28+
ij_java_else_on_new_line = true
29+
ij_java_imports_layout = unset
30+
ij_java_class_count_to_use_import_on_demand = 10
31+
ij_java_names_count_to_use_import_on_demand = 10
32+
ij_java_doc_do_not_wrap_if_one_line = true
33+
ij_xml_space_inside_empty_tag = true
34+
35+
[*.lang]
36+
trim_trailing_whitespace = false
37+
ij_properties_keep_blank_lines = true
38+
39+
[*.{json,info,mcmeta,yml,yaml}]
40+
indent_style = space
41+
indent_size = 2
42+
43+
[*.md]
44+
trim_trailing_whitespace = false

.gitattributes

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
# These are explicitly windows files and should use crlf
4+
*.bat text eol=crlf
5+
*.sh text eol=lf
6+
*.json text
7+
*.lang text
8+
*.mcmeta text
9+
*.info text
10+
*.jar binary
11+
*.zip binary
12+
*.class binary
13+
*.png binary
14+
*.ogg binary

.gitignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/.gradle/
2+
/.idea/
3+
/.vscode/
4+
/.settings/
5+
/build/
6+
/out/
7+
/run/
8+
/bin/
9+
/tmp/
10+
11+
.project
12+
.loadpath
13+
.metadata
14+
.cache-main
15+
.worksheet
16+
17+
# OS
18+
Thumbs.db
19+
ehthumbs.db
20+
Desktop.ini
21+
.DS_Store
22+
.LSOverride

build.gradle

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,46 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
maven {
5-
name = "forge"
6-
url = "http://files.minecraftforge.net/maven"
7-
}
8-
maven {
9-
name = "sonatype"
10-
url = "https://oss.sonatype.org/content/repositories/snapshots/"
11-
}
12-
}
13-
dependencies {
14-
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
15-
}
2+
repositories {
3+
mavenCentral()
4+
maven {
5+
name = 'forge'
6+
url = 'https://maven.minecraftforge.net/'
7+
}
8+
}
9+
dependencies {
10+
classpath('com.anatawa12.forge:ForgeGradle:1.2-1.1.+') {
11+
changing = true
12+
}
13+
}
1614
}
1715

1816
apply plugin: 'forge'
1917

20-
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
21-
22-
version = "1.7.10-1.1"
23-
group= "com.gamerforea"
24-
archivesBaseName = "PacketUnlimiter"
18+
tasks.withType(JavaCompile).configureEach {
19+
options.encoding = 'UTF-8'
20+
}
2521

2622
minecraft {
27-
version = "1.7.10-10.13.4.1614-1.7.10"
28-
runDir = "eclipse"
23+
version = "1.7.10-10.13.4.1614-1.7.10"
24+
runDir = "run"
25+
26+
replace '@VERSION@', project.mod_version
27+
replaceIn 'CoreMod.java'
2928
}
3029

30+
version = minecraft.version + '-' + project.mod_version
31+
3132
jar {
32-
manifest {
33-
attributes 'FMLCorePlugin': 'com.gamerforea.packetunlimiter.CoreMod'
34-
attributes 'FMLCorePluginContainsFMLMod': 'true'
35-
}
36-
}
33+
manifest {
34+
attributes 'FMLCorePlugin': project.core_mod_class
35+
attributes 'FMLCorePluginContainsFMLMod': 'true'
36+
}
37+
}
38+
39+
runClient {
40+
jvmArgs '-Dfml.coreMods.load=' + project.core_mod_class
41+
}
42+
43+
runServer {
44+
jvmArgs '-Dfml.coreMods.load=' + project.core_mod_class
45+
args 'nogui'
46+
}

gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Project
2+
group=com.gamerforea
3+
mod_version=1.1
4+
core_mod_class=com.gamerforea.packetunlimiter.CoreMod

gradle/wrapper/gradle-wrapper.jar

8.6 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Jul 02 15:54:47 CDT 2014
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

0 commit comments

Comments
 (0)