From ec9cb04ebc22de144ba079882bd4523346c006c2 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sun, 20 Nov 2022 01:33:48 +0200 Subject: [PATCH] Fix Loom 1.0 removals (#348) * Replace loom.forge.localMods with loom.mods * Replace javax annotations with jetbrains [norelease] --- .../registry/ReloadListenerRegistry.java | 2 +- .../registry/fabric/ReloadListenerRegistryImpl.java | 2 +- .../item/forge/imitator/ArchitecturyBucketItem.java | 2 +- .../architectury/platform/forge/PlatformImpl.java | 10 +++++----- .../registry/forge/CreativeTabRegistryImpl.java | 4 ++-- .../registry/forge/ReloadListenerRegistryImpl.java | 2 +- testmod-forge/build.gradle | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/dev/architectury/registry/ReloadListenerRegistry.java b/common/src/main/java/dev/architectury/registry/ReloadListenerRegistry.java index a68767a8..df76d591 100644 --- a/common/src/main/java/dev/architectury/registry/ReloadListenerRegistry.java +++ b/common/src/main/java/dev/architectury/registry/ReloadListenerRegistry.java @@ -23,8 +23,8 @@ import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.resources.PreparableReloadListener; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.Collection; import java.util.List; diff --git a/fabric/src/main/java/dev/architectury/registry/fabric/ReloadListenerRegistryImpl.java b/fabric/src/main/java/dev/architectury/registry/fabric/ReloadListenerRegistryImpl.java index 8e0c0497..8db20025 100644 --- a/fabric/src/main/java/dev/architectury/registry/fabric/ReloadListenerRegistryImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/fabric/ReloadListenerRegistryImpl.java @@ -28,8 +28,8 @@ import net.minecraft.server.packs.resources.PreparableReloadListener; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.util.profiling.ProfilerFiller; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.security.SecureRandom; import java.util.Collection; import java.util.concurrent.CompletableFuture; diff --git a/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java b/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java index c295d77c..f1578b9e 100644 --- a/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java +++ b/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java @@ -25,8 +25,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.function.Supplier; public class ArchitecturyBucketItem extends BucketItem { diff --git a/forge/src/main/java/dev/architectury/platform/forge/PlatformImpl.java b/forge/src/main/java/dev/architectury/platform/forge/PlatformImpl.java index f39b80e4..f35997b4 100644 --- a/forge/src/main/java/dev/architectury/platform/forge/PlatformImpl.java +++ b/forge/src/main/java/dev/architectury/platform/forge/PlatformImpl.java @@ -31,9 +31,9 @@ import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModInfo; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; @@ -100,25 +100,25 @@ public class PlatformImpl { } @Override - @Nonnull + @NotNull public String getModId() { return info.getModId(); } @Override - @Nonnull + @NotNull public String getVersion() { return info.getVersion().toString(); } @Override - @Nonnull + @NotNull public String getName() { return info.getDisplayName(); } @Override - @Nonnull + @NotNull public String getDescription() { return info.getDescription(); } diff --git a/forge/src/main/java/dev/architectury/registry/forge/CreativeTabRegistryImpl.java b/forge/src/main/java/dev/architectury/registry/forge/CreativeTabRegistryImpl.java index d5d5a7d2..790f8368 100644 --- a/forge/src/main/java/dev/architectury/registry/forge/CreativeTabRegistryImpl.java +++ b/forge/src/main/java/dev/architectury/registry/forge/CreativeTabRegistryImpl.java @@ -22,15 +22,15 @@ package dev.architectury.registry.forge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.function.Supplier; public class CreativeTabRegistryImpl { public static CreativeModeTab create(ResourceLocation resourceLocation, Supplier supplier) { return new CreativeModeTab(String.format("%s.%s", resourceLocation.getNamespace(), resourceLocation.getPath())) { @Override - @Nonnull + @NotNull public ItemStack makeIcon() { return supplier.get(); } diff --git a/forge/src/main/java/dev/architectury/registry/forge/ReloadListenerRegistryImpl.java b/forge/src/main/java/dev/architectury/registry/forge/ReloadListenerRegistryImpl.java index fc958741..ab0c59f9 100644 --- a/forge/src/main/java/dev/architectury/registry/forge/ReloadListenerRegistryImpl.java +++ b/forge/src/main/java/dev/architectury/registry/forge/ReloadListenerRegistryImpl.java @@ -31,8 +31,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.AddReloadListenerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.Collection; import java.util.List; diff --git a/testmod-forge/build.gradle b/testmod-forge/build.gradle index 86818c40..d54ae33e 100644 --- a/testmod-forge/build.gradle +++ b/testmod-forge/build.gradle @@ -6,14 +6,14 @@ plugins { loom { accessWidenerPath = project(":common").loom.accessWidenerPath + mods { + forge { + sourceSet project(":forge").sourceSets.main + } + } + forge { mixinConfig "architectury.mixins.json" - - localMods { - forge { - it.add(project(":forge").sourceSets.main) - } - } } }