Skip to content

Commit 7d8a544

Browse files
committed
Повышена версия Gradle
1 parent 0698677 commit 7d8a544

File tree

9 files changed

+324
-182
lines changed

9 files changed

+324
-182
lines changed

.editorconfig

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
max_line_length = 250
13+
tab_width = 4
14+
ij_java_space_before_if_parentheses = true
15+
ij_java_space_before_for_parentheses = true
16+
ij_java_space_before_try_parentheses = true
17+
ij_java_space_before_catch_parentheses = true
18+
ij_java_space_before_while_parentheses = true
19+
ij_java_space_before_switch_parentheses = true
20+
ij_java_space_before_synchronized_parentheses = true
21+
ij_java_space_after_type_cast = false
22+
ij_java_blank_lines_after_class_header = 1
23+
ij_java_if_brace_force = if_multiline
24+
ij_java_for_brace_force = if_multiline
25+
ij_java_while_brace_force = if_multiline
26+
ij_java_do_while_brace_force = if_multiline
27+
ij_java_imports_layout = unset
28+
ij_java_class_count_to_use_import_on_demand = 10
29+
ij_java_names_count_to_use_import_on_demand = 10
30+
ij_java_doc_do_not_wrap_if_one_line = true
31+
ij_xml_space_inside_empty_tag = true
32+
33+
[*.lang]
34+
trim_trailing_whitespace = false
35+
ij_properties_keep_blank_lines = true
36+
37+
[*.{json,info,mcmeta}]
38+
indent_style = space
39+
indent_size = 2
40+
41+
[*.md]
42+
trim_trailing_whitespace = false

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# Gradle
22
/.gradle
33
/build
4-
/minecraft
54

65
# IDEA
76
/.idea
87
/out
8+
/minecraft
9+
/run
910

1011
# OS
1112
Thumbs.db

build.gradle

Lines changed: 62 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,86 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
maven {
5-
name = 'forge'
6-
url = getProperty('minecraftforge.repository.url')
7-
}
8-
}
9-
dependencies {
10-
classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
11-
}
1+
plugins {
2+
id 'java-library'
3+
id 'net.minecraftforge.gradle' version '6.0.+'
4+
id 'idea'
5+
id 'maven-publish'
126
}
137

14-
apply plugin: 'net.minecraftforge.gradle'
15-
apply plugin: 'idea'
16-
178
idea {
189
module {
1910
inheritOutputDirs = true
2011
excludeDirs += file('./minecraft')
2112
}
2213
}
2314

24-
minecraft {
25-
// The mappings can be changed at any time, and must be in the following format.
26-
// snapshot_YYYYMMDD Snapshot are built nightly.
27-
// stable_# Stables are built at the discretion of the MCP team.
28-
mappings channel: 'snapshot', version: '20171003-1.12'
29-
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
15+
java {
16+
toolchain.languageVersion = JavaLanguageVersion.of(8)
17+
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
18+
}
3019

31-
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
20+
legacy {
21+
fixClasspath = true
22+
extractMappings = true
23+
attachMappings = true
24+
}
25+
26+
repositories {
27+
mavenCentral()
28+
maven {
29+
// Su5ed LegacyDev Fork
30+
url = "https://maven.su5ed.dev/releases"
31+
}
32+
}
33+
34+
minecraft {
35+
mappings channel: 'stable', version: '39-1.12'
36+
// accessTransformer = file('src/main/resources/META-INF/modid_at.cfg')
3237

33-
// Default run configurations.
34-
// These can be tweaked, removed, or duplicated as needed.
3538
runs {
36-
client {
37-
workingDirectory project.file('minecraft')
39+
configureEach {
40+
workingDirectory file('minecraft')
3841

39-
// Recommended logging data for a userdev environment
4042
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
41-
42-
// Recommended logging level for the console
4343
property 'forge.logging.console.level', 'debug'
44+
environment 'MC_VERSION', '1.12.2'
45+
46+
mods {
47+
"${mod_id}" {
48+
source sourceSets.main
49+
}
50+
}
4451
}
52+
53+
client {}
4554
}
4655
}
4756

4857
dependencies {
49-
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
50-
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
51-
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
5258
minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2860'
53-
}
5459

55-
// Project settings
56-
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
60+
constraints {
61+
implementation('net.minecraftforge:legacydev:0.3.0.0-legacyExt') {
62+
because 'needed to have all ATs work properly'
63+
}
64+
65+
implementation('org.ow2.asm:asm-debug-all:5.2') {
66+
because 'newer ASM versions include module info that causes errors in Java 8'
67+
}
68+
}
69+
70+
configurations.forEach {
71+
// MergeTool pollutes the classpath with conflicting classes
72+
it.exclude(group: 'net.minecraftforge', module: 'mergetool')
73+
74+
// LegacyDev forge dep wants fatjar as the classifier, but 3.0 lacks it
75+
it.resolutionStrategy.eachDependency {
76+
if (it.requested.module.toString() == "net.minecraftforge:legacydev") {
77+
it.artifactSelection {
78+
it.selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
79+
}
80+
}
81+
}
82+
}
83+
}
5784

5885
tasks.withType(JavaCompile).configureEach {
5986
options.encoding = 'UTF-8'
@@ -66,15 +93,12 @@ jar {
6693
}
6794
}
6895

69-
// This is the preferred method to reobfuscate your jar file
70-
jar.finalizedBy('reobfJar')
71-
7296
tasks.register('devJar', Jar) {
7397
archiveClassifier.set('dev')
7498
manifest = jar.manifest
7599
from sourceSets.main.output
76100
}
77101

78102
artifacts {
79-
archives devJar
103+
archives tasks.named('devJar')
80104
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ group=com.gamerforea
33
version=1.12.2
44

55
# Repositories
6-
minecraftforge.repository.url=https://maven.minecraftforge.net/
6+
net.minecraftforge.repository.url=https://maven.minecraftforge.net/

gradle/wrapper/gradle-wrapper.jar

-14.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
36
zipStoreBase=GRADLE_USER_HOME
47
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

0 commit comments

Comments
 (0)