Skip to content

Commit b7a39fb

Browse files
committed
ATs work again. I don't know HOW or WHY, but they do
1 parent 7c8880c commit b7a39fb

File tree

4 files changed

+16
-24
lines changed

4 files changed

+16
-24
lines changed

settings.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ rootProject.name = 'forgegradle'
88

99
dependencyResolutionManagement {
1010
repositories {
11-
//mavenLocal()
1211
mavenCentral()
12+
gradlePluginPortal()
1313
maven gradleutils.forgeMaven
1414
maven { url = 'https://maven.moddinglegacy.com/maven' } // Gradle API
15-
mavenLocal()
15+
//mavenLocal()
1616
}
1717

1818
//@formatter:off
1919
versionCatalogs.register('libs') {
2020
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
21-
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.0.3' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
22-
plugin 'changelog', 'net.minecraftforge.changelog' version '3.0.3' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
23-
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '1.3.1' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
24-
plugin 'shadow', 'com.gradleup.shadow' version '9.0.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
21+
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
22+
plugin 'changelog', 'net.minecraftforge.changelog' version '3.1.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
23+
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
24+
plugin 'shadow', 'com.gradleup.shadow' version '9.2.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
2525

2626
// Static Analysis
2727
library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
@@ -37,7 +37,7 @@ dependencyResolutionManagement {
3737

3838
// AccessTransformers Gradle Plugin
3939
// https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
40-
library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '4.0.2'
40+
library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '5.0.0-beta.0'
4141

4242
library 'utils-data', 'net.minecraftforge', 'json-data-utils' version '0.2.1' // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
4343
library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.1.9' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html

src/main/java/net/minecraftforge/gradle/ForgeGradleTask.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright (c) Forge Development LLC and contributors
3+
* SPDX-License-Identifier: LGPL-2.1-only
4+
*/
15
package net.minecraftforge.gradle;
26

37
import net.minecraftforge.gradleutils.shared.EnhancedPlugin;

src/main/java/net/minecraftforge/gradle/MinecraftDependencyImpl.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,26 +156,19 @@ static abstract class WithAccessTransformersImpl extends MinecraftDependencyImpl
156156
private final AccessTransformersContainer atContainer;
157157
private final Property<String> atPath = this.getObjects().property(String.class);
158158

159-
private @UnknownNullability Provider<ExternalModuleDependency> delegate;
160-
161159
@Inject
162160
public WithAccessTransformersImpl(Project project) {
163161
super(project);
164-
this.atContainer = AccessTransformersContainer.register(
165-
project, Attribute.of("net.minecraftforge.gradle.accesstransformed." + this.postIncrementContainerCount(), Boolean.class), it -> { }
166-
);
162+
this.atContainer = AccessTransformersContainer.register(project, it -> { });
167163
this.atPath.convention(project.getExtensions().getByType(MinecraftExtensionForProjectWithAccessTransformers.class).getAccessTransformers());
168164
}
169165

170-
@Override
171-
public Provider<ExternalModuleDependency> getDelegate() {
172-
return this.delegate;
173-
}
174-
175166
@Override
176167
Provider<ExternalModuleDependency> setDelegate(Object dependencyNotation, Closure<?> closure) {
177-
var dependency = super.setDelegate(dependencyNotation, closure);
178-
return this.delegate = this.atPath.map(path -> (ExternalModuleDependency) this.atContainer.dep(dependency).get()).orElse(dependency);
168+
return super.setDelegate(dependencyNotation, Closures.<Dependency>consumer(dependency -> {
169+
Closures.invoke(closure, dependency);
170+
this.atContainer.configure(dependency);
171+
}));
179172
}
180173

181174
@Override

src/main/java/net/minecraftforge/gradle/SlimeLauncherExec.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55
package net.minecraftforge.gradle;
66

7-
import net.minecraftforge.gradleutils.shared.EnhancedTask;
8-
import net.minecraftforge.gradleutils.shared.SharedUtil;
97
import net.minecraftforge.util.data.json.RunConfig;
108
import org.gradle.api.Project;
119
import org.gradle.api.artifacts.Dependency;
@@ -29,11 +27,8 @@
2927
import javax.inject.Inject;
3028
import java.io.IOException;
3129
import java.nio.file.Files;
32-
import java.util.Arrays;
3330
import java.util.List;
34-
import java.util.Locale;
3531
import java.util.Map;
36-
import java.util.stream.Stream;
3732

3833
abstract class SlimeLauncherExec extends JavaExec implements ForgeGradleTask, HasPublicType {
3934
static void register(Project project, SourceSet sourceSet, SlimeLauncherOptionsImpl options, Map<String, RunConfig> configs, Dependency dependency, Provider<RegularFile> metadataZip, boolean single) {

0 commit comments

Comments
 (0)