aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/build.gradle8
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java5
3 files changed, 6 insertions, 9 deletions
diff --git a/runtime/build.gradle b/runtime/build.gradle
index ef54168cc..547ffb9e3 100644
--- a/runtime/build.gradle
+++ b/runtime/build.gradle
@@ -12,8 +12,8 @@ dependencies {
modCompileOnly("net.fabricmc:fabric-loader:${project.fabricloader_version}")
modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}")
modApi("dev.architectury:architectury:${architectury_version}")
- compileClasspath(annotationProcessor("org.projectlombok:lombok:1.18.22"))
- compileClasspath(project(path: ":api", configuration: "namedElements"))
+ compileOnly(annotationProcessor("org.projectlombok:lombok:1.18.22"))
+ compileOnly(project(path: ":api", configuration: "namedElements"))
testImplementation(project(path: ":api", configuration: "namedElements"))
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
}
@@ -23,7 +23,7 @@ test {
}
remapJar {
- classifier "raw"
+ archiveClassifier = "raw"
}
task fakeJar(type: Jar, dependsOn: remapJar) {
@@ -31,7 +31,7 @@ task fakeJar(type: Jar, dependsOn: remapJar) {
from(rootProject.file("fake/fabric.mod.json")) {
into ""
}
- classifier null
+ archiveClassifier = null
}
artifacts {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
index ad5e74d27..8676449be 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
@@ -43,8 +43,8 @@ import net.minecraft.client.resources.language.I18n;
import net.minecraft.util.FormattedCharSequence;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
+import org.jetbrains.annotations.Nullable;
-import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.function.IntSupplier;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java
index a95fe59fc..a97721bd0 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java
@@ -23,7 +23,6 @@
package me.shedaniel.rei.impl.client.search.collapsed;
-import com.google.common.collect.Lists;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import me.shedaniel.rei.api.client.registry.entry.CollapsibleEntryRegistry;
@@ -31,13 +30,11 @@ import me.shedaniel.rei.impl.common.InternalLogger;
import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsibleEntryRegistryImpl;
import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper;
import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.Nullable;
-import javax.annotation.Nullable;
import java.util.Collection;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
public class CollapsedEntriesCache {
private static CollapsedEntriesCache instance = new CollapsedEntriesCache();