Skip to content

Commit 8ef2ec6

Browse files
committed
✨ Update to Minecraft 1.21.11
1 parent ba2a7d0 commit 8ef2ec6

58 files changed

Lines changed: 274 additions & 277 deletions

File tree

Some content is hidden

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

build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
buildscript {
2+
dependencies {
3+
classpath 'commons-io:commons-io:2.20.0'
4+
}
5+
}
6+
17
plugins {
2-
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
3-
id 'fabric-loom' version '1.11-SNAPSHOT' apply false
4-
id 'net.neoforged.gradle.userdev' version '7.0.192' apply false
5-
id 'net.neoforged.moddev' version '2.0.111' apply false
8+
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
9+
id 'fabric-loom' version '1.14-SNAPSHOT' apply false
10+
id 'net.neoforged.moddev' version '2.0.124' apply false
611
}

buildSrc/src/main/groovy/multiloader-common.gradle

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ java {
1818

1919
repositories {
2020
mavenCentral()
21+
mavenLocal()
2122
// https://docs.gradle.org/current/userguide/declaring_repositories.html#declaring_content_exclusively_found_in_one_repository
2223
exclusiveContent {
2324
forRepository {
@@ -56,11 +57,6 @@ repositories {
5657
includeGroupAndSubgroups("com.mrcrayfish")
5758
}
5859
}
59-
if (!System.getenv("CI") && System.getenv("LOCAL_MAVEN")) {
60-
maven {
61-
url "file://" + System.getenv("LOCAL_MAVEN")
62-
}
63-
}
6460
maven {
6561
name = 'BlameJared'
6662
url = 'https://maven.blamejared.com'
@@ -182,10 +178,8 @@ publishing {
182178
password = findProperty("gpr.key") ?: System.getenv("GPR_KEY")
183179
}
184180
}
185-
} else if(System.getenv("LOCAL_MAVEN")) {
186-
maven {
187-
url "file://" + System.getenv("LOCAL_MAVEN")
188-
}
181+
} else {
182+
mavenLocal()
189183
}
190184
}
191185
}

buildSrc/src/main/groovy/multiloader-loader.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ dependencies {
1616
capabilities {
1717
requireCapability "$group:$mod_id"
1818
}
19-
}
20-
testCompileOnly(project(':common')) {
21-
capabilities {
22-
requireCapability "$group:$mod_id"
19+
def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String)
20+
attributes {
21+
attribute(loaderAttribute, 'common')
2322
}
2423
}
2524
commonJava project(path: ':common', configuration: 'commonJava')

common/build.gradle

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ neoForge {
1414
dependencies {
1515
compileOnly "org.spongepowered:mixin:0.8.5"
1616
compileOnly "com.mrcrayfish:framework-common:${minecraft_version}-${framework_version}"
17-
compileOnly "mezz.jei:jei-1.21.9-common-api:${jei_version}"
18-
compileOnly "com.electronwill.night-config:core:3.7.1"
19-
compileOnly "com.electronwill.night-config:toml:3.7.1"
17+
compileOnly "mezz.jei:jei-1.21.10-common-api:${jei_version}"
18+
compileOnly "com.electronwill.night-config:core:${night_config_version}"
19+
compileOnly "com.electronwill.night-config:toml:${night_config_version}"
2020
}
2121

2222
configurations {
@@ -33,4 +33,23 @@ configurations {
3333
artifacts {
3434
commonJava sourceSets.main.java.sourceDirectories.singleFile
3535
commonResources sourceSets.main.resources.sourceDirectories.singleFile
36+
}
37+
38+
// Implement mcgradleconventions loader attribute
39+
def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String)
40+
['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant ->
41+
configurations.named("$variant") {
42+
attributes {
43+
attribute(loaderAttribute, 'common')
44+
}
45+
}
46+
}
47+
sourceSets.configureEach {
48+
[it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant->
49+
configurations.named("$variant") {
50+
attributes {
51+
attribute(loaderAttribute, 'common')
52+
}
53+
}
54+
}
3655
}

common/src/main/java/com/mrcrayfish/configured/Bootstrap.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.mrcrayfish.configured;
22

3-
import com.mrcrayfish.configured.api.Environment;
43
import com.mrcrayfish.configured.platform.Services;
54

65
/**

common/src/main/java/com/mrcrayfish/configured/Config.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@
44
import com.mrcrayfish.configured.api.Environment;
55
import com.mrcrayfish.configured.platform.Services;
66
import net.minecraft.ChatFormatting;
7-
import net.minecraft.Util;
7+
import net.minecraft.util.Util;
88

99
import java.io.File;
1010
import java.io.FileInputStream;
1111
import java.io.IOException;
1212
import java.nio.file.Files;
1313
import java.nio.file.Path;
1414
import java.nio.file.StandardOpenOption;
15-
import java.util.ArrayList;
16-
import java.util.List;
17-
import java.util.Optional;
18-
import java.util.Properties;
19-
import java.util.StringJoiner;
20-
import java.util.UUID;
15+
import java.util.*;
2116
import java.util.regex.Pattern;
2217

2318
/**

common/src/main/java/com/mrcrayfish/configured/api/ConfigType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.mrcrayfish.configured.api;
22

33
import org.jetbrains.annotations.Nullable;
4+
45
import java.util.Optional;
56

67
/**

common/src/main/java/com/mrcrayfish/configured/api/IConfigEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.mrcrayfish.configured.api;
22

33
import net.minecraft.network.chat.Component;
4-
54
import org.jetbrains.annotations.Nullable;
5+
66
import java.util.List;
77

88
/**

common/src/main/java/com/mrcrayfish/configured/api/IConfigValue.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.mrcrayfish.configured.api;
22

33
import net.minecraft.network.chat.Component;
4-
54
import org.jetbrains.annotations.Nullable;
65

76
/**

common/src/main/java/com/mrcrayfish/configured/api/ValueEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.mrcrayfish.configured.api;
22

33
import net.minecraft.network.chat.Component;
4-
54
import org.jetbrains.annotations.Nullable;
5+
66
import java.util.Collections;
77
import java.util.List;
88

0 commit comments

Comments
 (0)