diff --git a/build.gradle b/build.gradle index 8ea0a922..55d1deaf 100644 --- a/build.gradle +++ b/build.gradle @@ -70,8 +70,8 @@ allprojects { modImplementation "net.fabricmc.fabric-api:fabric-api:0.30.0+1.16" implementation 'net.patchworkmc:event-racecar:1.0.1:with-typetools' - implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'com.electronwill.night-config:toml:3.6.2' + implementation 'org.cadixdev:lorenz:0.5.7' } configurations { @@ -84,7 +84,7 @@ allprojects { afterEvaluate { remapJar { - input = file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar") + input.set(file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar")) archiveName = "${archivesBaseName}-${version}.jar" } @@ -183,36 +183,6 @@ subprojects { javadoc.enabled = false } -subprojects.each { bintrayUpload.dependsOn("${it.path}:bintrayUpload") } - -bintray { - user = project.hasProperty('bintrayUser') ? project.getProperty('bintrayUser') : System.getenv('bintray_user') - key = project.hasProperty('bintrayKey') ? project.getProperty('bintrayKey') : System.getenv('bintray_key') - publish = true - override = true - publications = ['mavenJava'] - pkg { - repo = project.bintrayRepo - name = project.name - user = bintray.user - userOrg = project.repoOwner - licenses = [project.codeLicense] - desc = project.description - websiteUrl = "https://github.com/${project.repoOwner}/${project.repoName}" - issueTrackerUrl = "https://github.com/${project.repoOwner}/${project.repoName}/issues" - vcsUrl = "https://github.com/${project.repoOwner}/${project.repoName}.git" - publicDownloadNumbers = true - - githubRepo = "${project.repoOwner}/${project.repoName}" - version { - name = project.version - released = new Date() - } - } - - javadoc.enabled = false -} - task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) { afterEvaluate { input = file("${project.buildDir}/libs/${archivesBaseName}-${version}-dev.jar") @@ -267,7 +237,8 @@ dependencies { include 'com.electronwill.night-config:core:3.6.2' include 'com.electronwill.night-config:toml:3.6.2' include 'net.patchworkmc:event-racecar:1.0.1:with-typetools' - include 'org.cadixdev:lorenz:0.5.4' + include 'org.cadixdev:lorenz:0.5.7' + include 'org.cadixdev:bombe:0.3.4' } loom { diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/LazyOptional.java b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/LazyOptional.java index e42bb0a3..da84688c 100644 --- a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/LazyOptional.java +++ b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/LazyOptional.java @@ -25,13 +25,11 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * This object encapsulates a lazy value, with typical transformation operations @@ -49,14 +47,13 @@ * * @param The type of the optional value. */ -@ParametersAreNonnullByDefault public class LazyOptional { private final NonNullSupplier supplier; private AtomicReference resolved; private Set>> listeners = new HashSet<>(); private boolean isValid = true; - private static final @Nonnull LazyOptional EMPTY = new LazyOptional<>(null); + private static final @NotNull LazyOptional EMPTY = new LazyOptional<>(null); private static final Logger LOGGER = LogManager.getLogger(); /** diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullConsumer.java b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullConsumer.java index 9530b7bc..10c8e7f4 100644 --- a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullConsumer.java +++ b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullConsumer.java @@ -21,14 +21,14 @@ import java.util.function.Consumer; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** - * Equivalent to {@link Consumer}, except with nonnull contract. + * Equivalent to {@link Consumer}, except with NotNull contract. * * @see Consumer */ @FunctionalInterface public interface NonNullConsumer { - void accept(@Nonnull T t); + void accept(@NotNull T t); } diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullFunction.java b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullFunction.java index f0d3f39f..10ae9a83 100644 --- a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullFunction.java +++ b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullFunction.java @@ -21,7 +21,7 @@ import java.util.function.Function; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Equivalent to {@link Function}, except with nonnull contract. @@ -30,6 +30,6 @@ */ @FunctionalInterface public interface NonNullFunction { - @Nonnull - R apply(@Nonnull T t); + @NotNull + R apply(@NotNull T t); } diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullPredicate.java b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullPredicate.java index 25805ff0..89cbab4a 100644 --- a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullPredicate.java +++ b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullPredicate.java @@ -21,7 +21,7 @@ import java.util.function.Predicate; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Equivalent to {@link Predicate}, except with nonnull contract. @@ -30,5 +30,5 @@ */ @FunctionalInterface public interface NonNullPredicate { - boolean test(@Nonnull T t); + boolean test(@NotNull T t); } diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullSupplier.java b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullSupplier.java index 12955a31..c9633493 100644 --- a/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullSupplier.java +++ b/patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullSupplier.java @@ -21,7 +21,7 @@ import java.util.function.Supplier; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * Equivalent to {@link Supplier}, except with nonnull contract. @@ -30,6 +30,6 @@ */ @FunctionalInterface public interface NonNullSupplier { - @Nonnull + @NotNull T get(); } diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java index 8756b6e6..89b60a87 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java @@ -21,11 +21,10 @@ import java.util.concurrent.Callable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Throwables; import net.minecraftforge.common.util.LazyOptional; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraft.nbt.Tag; import net.minecraft.util.math.Direction; @@ -147,7 +146,7 @@ public T getDefaultInstance() { } } - public @Nonnull LazyOptional orEmpty(Capability toCheck, LazyOptional inst) { + public @NotNull LazyOptional orEmpty(Capability toCheck, LazyOptional inst) { return this == toCheck ? inst.cast() : LazyOptional.empty(); } diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java index 59085781..b2ac2cf5 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java @@ -22,12 +22,10 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - import com.google.common.collect.Lists; import net.minecraftforge.common.util.INBTSerializable; import net.minecraftforge.common.util.LazyOptional; +import org.jetbrains.annotations.Nullable; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -44,7 +42,6 @@ * Internally the handlers are baked into arrays for fast iteration. * The ResourceLocations will be used for the NBT Key when serializing. */ -@ParametersAreNonnullByDefault public final class CapabilityDispatcher implements INBTSerializable, ICapabilityProvider { private final ICapabilityProvider[] caps; private final INBTSerializable[] writers; diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java index 3ba06e9a..47583cbd 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java @@ -19,12 +19,9 @@ package net.minecraftforge.common.capabilities; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - import net.minecraftforge.common.util.LazyOptional; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; @@ -32,7 +29,6 @@ import net.patchworkmc.api.capability.CapabilityProviderConvertible; import net.patchworkmc.impl.capability.CapabilityEvents; -@ParametersAreNonnullByDefault public abstract class CapabilityProvider implements ICapabilityProvider, CapabilityProviderConvertible { protected final Class baseClass; protected CapabilityDispatcher capabilities; @@ -104,8 +100,8 @@ public void reviveCaps() { } @Override - @Nonnull - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { + @NotNull + public LazyOptional getCapability(@NotNull Capability cap, @Nullable Direction side) { final CapabilityDispatcher disp = getCapabilities(); return !valid || disp == null ? LazyOptional.empty() : disp.getCapability(cap, side); } diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/ICapabilityProvider.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/ICapabilityProvider.java index 4e33d684..a216f798 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/ICapabilityProvider.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/ICapabilityProvider.java @@ -19,10 +19,9 @@ package net.minecraftforge.common.capabilities; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraftforge.common.util.LazyOptional; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraft.util.math.Direction; @@ -39,15 +38,15 @@ public interface ICapabilityProvider { * CAN BE NULL. Null is defined to represent 'internal' or 'self' * @return The requested a {@link LazyOptional optional} holding the requested capability. */ - @Nonnull - LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction direction); + @NotNull + LazyOptional getCapability(@NotNull Capability capability, @Nullable Direction direction); /* * Purely added as a bouncer to sided version, to make modders stop complaining about calling with a null value. * This should never be OVERRIDDEN, modders should only ever implement the sided version. */ - @Nonnull - default LazyOptional getCapability(@Nonnull final Capability cap) { + @NotNull + default LazyOptional getCapability(@NotNull final Capability cap) { return getCapability(cap, null); } } diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java index c74211ae..2f65bd4a 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java @@ -19,7 +19,7 @@ package net.minecraftforge.common.util; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.PersistentState; diff --git a/patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityProviderConvertible.java b/patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityProviderConvertible.java index 962ce58f..b1de428d 100644 --- a/patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityProviderConvertible.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityProviderConvertible.java @@ -19,11 +19,10 @@ package net.patchworkmc.api.capability; -import javax.annotation.Nonnull; - import net.minecraftforge.common.capabilities.CapabilityProvider; +import org.jetbrains.annotations.NotNull; public interface CapabilityProviderConvertible { - @Nonnull + @NotNull CapabilityProvider patchwork$getCapabilityProvider(); } diff --git a/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java index 33f93094..64c815ac 100644 --- a/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java @@ -19,10 +19,9 @@ package net.patchworkmc.impl.capability; -import javax.annotation.Nullable; - import net.minecraftforge.common.capabilities.CapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import org.jetbrains.annotations.Nullable; public class BaseCapabilityProvider extends CapabilityProvider { private final T provider; diff --git a/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityEvents.java b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityEvents.java index 42794d67..6c753d35 100644 --- a/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityEvents.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityEvents.java @@ -19,12 +19,11 @@ package net.patchworkmc.impl.capability; -import javax.annotation.Nullable; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.CapabilityDispatcher; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.event.AttachCapabilitiesEvent; +import org.jetbrains.annotations.Nullable; public class CapabilityEvents { // This is less restrictive than Forge's implementation, since patchwork can't make vanilla extend stuff at random. diff --git a/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java index 9e83d05f..8acbfeb2 100644 --- a/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java @@ -19,14 +19,13 @@ package net.patchworkmc.impl.capability; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityDispatcher; import net.minecraftforge.common.capabilities.CapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; @@ -74,13 +73,13 @@ default void reviveCaps() { patchwork$getCapabilityProvider().reviveCaps(); } - @Nonnull - default LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { + @NotNull + default LazyOptional getCapability(@NotNull Capability cap, @Nullable Direction side) { return patchwork$getCapabilityProvider().getCapability(cap, side); } - @Nonnull - default LazyOptional getCapability(@Nonnull Capability cap) { + @NotNull + default LazyOptional getCapability(@NotNull Capability cap) { return patchwork$getCapabilityProvider().getCapability(cap); } } diff --git a/patchwork-dispatcher/src/main/java/net/patchworkmc/impl/PatchworkClientModLoader.java b/patchwork-dispatcher/src/main/java/net/patchworkmc/impl/PatchworkClientModLoader.java index 5112ace1..33f31abf 100644 --- a/patchwork-dispatcher/src/main/java/net/patchworkmc/impl/PatchworkClientModLoader.java +++ b/patchwork-dispatcher/src/main/java/net/patchworkmc/impl/PatchworkClientModLoader.java @@ -24,18 +24,18 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import net.minecraft.resource.ResourceManager; -import net.minecraft.resource.ResourceReloadListener; -import net.minecraft.util.profiler.Profiler; import net.minecraft.client.MinecraftClient; import net.minecraft.client.resource.ClientBuiltinResourcePackProvider; import net.minecraft.resource.ReloadableResourceManager; +import net.minecraft.resource.ResourceManager; +import net.minecraft.resource.ResourceReloadListener; +import net.minecraft.util.profiler.Profiler; public class PatchworkClientModLoader { private static final Logger LOGGER = LogManager.getLogger(PatchworkClientModLoader.class); diff --git a/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json b/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json index a7ab7842..92a5c893 100644 --- a/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json +++ b/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json @@ -4,20 +4,20 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "BannerPatternAccessor", + "EntityCategoryAccessor", "MixinBannerPattern", - "MixinEnchantmentTargetInner", "MixinEnchantmentTarget", - "EntityCategoryAccessor", + "MixinEnchantmentTargetInner", "MixinEntityCategory", - "OreFeatureConfigTargetAccessor", "MixinOreFeatureConfigTarget", - "RarityAccessor", "MixinRarity", "MixinSpawnHelper", - "SpawnRestrictionLocationAccessor", "MixinSpawnRestrictionLocation", - "StructurePoolProjectionAccessor", - "MixinStructurePoolProjection" + "MixinStructurePoolProjection", + "OreFeatureConfigTargetAccessor", + "RarityAccessor", + "SpawnRestrictionLocationAccessor", + "StructurePoolProjectionAccessor" ], "injectors": { "defaultRequire": 1 diff --git a/patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java b/patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java index a03ef3db..0ed8a4f3 100644 --- a/patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java @@ -19,14 +19,13 @@ package net.patchworkmc.impl.event.entity; -import javax.annotation.Nonnull; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.extensions.IForgeItemStack; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.item.ItemExpireEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingEvent; +import org.jetbrains.annotations.NotNull; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityDimensions; @@ -43,7 +42,7 @@ public static EntityEvent.Size getEntitySizeForge(Entity player, EntityPose pose return evt; } - public static int onItemExpire(ItemEntity entity, @Nonnull ItemStack item) { + public static int onItemExpire(ItemEntity entity, @NotNull ItemStack item) { if (item.isEmpty()) return -1; ItemExpireEvent event = new ItemExpireEvent(entity, ((IForgeItemStack) (Object) item).getEntityLifespan(entity.world)); if (!MinecraftForge.EVENT_BUS.post(event)) return -1; diff --git a/patchwork-events-entity/src/old/MixinEntityType.java b/patchwork-events-entity/src/old/MixinEntityType.java index efc6f32f..484d428d 100644 --- a/patchwork-events-entity/src/old/MixinEntityType.java +++ b/patchwork-events-entity/src/old/MixinEntityType.java @@ -19,7 +19,7 @@ package net.patchworkmc.mixin.event.entity.old; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/DrawHighlightEvent.java b/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/DrawHighlightEvent.java index 0f3d838c..d8887670 100644 --- a/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/DrawHighlightEvent.java +++ b/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/DrawHighlightEvent.java @@ -21,10 +21,10 @@ import net.minecraftforge.eventbus.api.Event; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.render.Camera; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; diff --git a/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderHandEvent.java b/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderHandEvent.java index 5922ad7e..ab6f24c5 100644 --- a/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderHandEvent.java +++ b/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderHandEvent.java @@ -19,9 +19,8 @@ package net.minecraftforge.client.event; -import javax.annotation.Nonnull; - import net.minecraftforge.eventbus.api.Event; +import org.jetbrains.annotations.NotNull; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.MatrixStack; @@ -42,10 +41,10 @@ public class RenderHandEvent extends Event { private final float interpolatedPitch; private final float swingProgress; private final float equipProgress; - @Nonnull + @NotNull private final ItemStack stack; - public RenderHandEvent(Hand hand, MatrixStack mat, VertexConsumerProvider buffers, int light, float partialTicks, float interpolatedPitch, float swingProgress, float equipProgress, @Nonnull ItemStack stack) { + public RenderHandEvent(Hand hand, MatrixStack mat, VertexConsumerProvider buffers, int light, float partialTicks, float interpolatedPitch, float swingProgress, float equipProgress, @NotNull ItemStack stack) { this.hand = hand; this.mat = mat; this.buffers = buffers; @@ -101,7 +100,7 @@ public float getEquipProgress() { /** * @return The ItemStack to be rendered */ - @Nonnull + @NotNull public ItemStack getItemStack() { return stack; } diff --git a/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java b/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java index 79680554..eee78f3e 100644 --- a/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java +++ b/patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java @@ -19,9 +19,9 @@ package net.minecraftforge.client.event; +import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.Matrix4f; -import net.minecraft.client.render.WorldRenderer; public class RenderWorldLastEvent extends net.minecraftforge.eventbus.api.Event { private final WorldRenderer context; diff --git a/patchwork-events-rendering/src/main/java/net/patchworkmc/impl/event/render/RenderEvents.java b/patchwork-events-rendering/src/main/java/net/patchworkmc/impl/event/render/RenderEvents.java index 02a3c984..29827c53 100644 --- a/patchwork-events-rendering/src/main/java/net/patchworkmc/impl/event/render/RenderEvents.java +++ b/patchwork-events-rendering/src/main/java/net/patchworkmc/impl/event/render/RenderEvents.java @@ -22,27 +22,27 @@ import java.util.Set; import net.minecraftforge.client.event.ColorHandlerEvent; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.DrawHighlightEvent; -import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.ModLoader; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Matrix4f; import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.item.ItemColors; import net.minecraft.client.render.Camera; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.texture.SpriteAtlasTexture; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.Matrix4f; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; diff --git a/patchwork-events-rendering/src/main/java/net/patchworkmc/mixin/event/render/MixinHeldItemRenderer.java b/patchwork-events-rendering/src/main/java/net/patchworkmc/mixin/event/render/MixinHeldItemRenderer.java index 1b0baf1e..2e35ab47 100644 --- a/patchwork-events-rendering/src/main/java/net/patchworkmc/mixin/event/render/MixinHeldItemRenderer.java +++ b/patchwork-events-rendering/src/main/java/net/patchworkmc/mixin/event/render/MixinHeldItemRenderer.java @@ -24,10 +24,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.HeldItemRenderer; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; diff --git a/patchwork-events-rendering/src/main/resources/patchwork-events-rendering.mixins.json b/patchwork-events-rendering/src/main/resources/patchwork-events-rendering.mixins.json index ac4129ef..20929a88 100644 --- a/patchwork-events-rendering/src/main/resources/patchwork-events-rendering.mixins.json +++ b/patchwork-events-rendering/src/main/resources/patchwork-events-rendering.mixins.json @@ -3,10 +3,10 @@ "package": "net.patchworkmc.mixin.event.render", "compatibilityLevel": "JAVA_8", "client": [ - "MixinItemColors", "MixinBlockColors", - "MixinSpriteAtlasTexture", - "MixinHeldItemRenderer" + "MixinHeldItemRenderer", + "MixinItemColors", + "MixinSpriteAtlasTexture" ], "injectors": { "defaultRequire": 1 diff --git a/patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java b/patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java index b99227d1..f72e8305 100644 --- a/patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Random; -import javax.annotation.Nullable; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.DifficultyChangeEvent; import net.minecraftforge.event.world.ChunkEvent; @@ -32,19 +30,20 @@ import net.minecraftforge.event.world.SaplingGrowTreeEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.Event; +import org.jetbrains.annotations.Nullable; import net.minecraft.entity.SpawnGroup; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.Difficulty; +import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.WorldChunk; import net.minecraft.world.level.ServerWorldProperties; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraft.world.biome.SpawnSettings; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; diff --git a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java index 18252094..483f4b35 100644 --- a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java @@ -26,10 +26,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.MutableWorldProperties; import net.minecraft.client.world.ClientWorld; import net.minecraft.util.profiler.Profiler; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.MutableWorldProperties; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; diff --git a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java index 6312b767..156f8ce7 100644 --- a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java @@ -33,10 +33,10 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.ServerTask; import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.thread.ReentrantThreadExecutor; -import net.minecraft.world.level.ServerWorldProperties; import net.minecraft.util.registry.RegistryKey; +import net.minecraft.util.thread.ReentrantThreadExecutor; import net.minecraft.world.World; +import net.minecraft.world.level.ServerWorldProperties; import net.patchworkmc.impl.event.world.WorldEvents; diff --git a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSaplingBlock.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSaplingBlock.java index 9863f4a9..9d022e2e 100644 --- a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSaplingBlock.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSaplingBlock.java @@ -28,8 +28,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.SaplingBlock; -import net.minecraft.util.math.BlockPos; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; import net.patchworkmc.impl.event.world.WorldEvents; diff --git a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java index 0e143bad..d17747e9 100644 --- a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java @@ -28,10 +28,10 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.profiler.Profiler; -import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.MutableWorldProperties; +import net.minecraft.world.World; +import net.minecraft.world.dimension.DimensionType; import net.patchworkmc.impl.event.world.WorldEvents; diff --git a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java index b10cca11..db98cbde 100644 --- a/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java @@ -19,6 +19,8 @@ package net.patchworkmc.mixin.event.world; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.ChunkEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -28,8 +30,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.ChunkEvent; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.Packet; diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/extensions/IForgeBakedModel.java b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/extensions/IForgeBakedModel.java index 24e941f4..da57dba7 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/extensions/IForgeBakedModel.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/extensions/IForgeBakedModel.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Random; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.client.model.data.IModelData; @@ -44,8 +44,8 @@ default BakedModel getBakedModel() { return (BakedModel) this; } - @Nonnull - default List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) { + @NotNull + default List getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull Random rand, @NotNull IModelData extraData) { return getBakedModel().getQuads(state, side, rand); } @@ -53,12 +53,12 @@ default boolean isAmbientOcclusion(BlockState state) { return getBakedModel().useAmbientOcclusion(); } - @Nonnull - default IModelData getModelData(@Nonnull BlockRenderView world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) { + @NotNull + default IModelData getModelData(@NotNull BlockRenderView world, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull IModelData tileData) { return tileData; } - default Sprite getParticleTexture(@Nonnull IModelData data) { + default Sprite getParticleTexture(@NotNull IModelData data) { return getBakedModel().getSprite(); } } diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/ModelDataManager.java b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/ModelDataManager.java index b3de5f37..e67dfd58 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/ModelDataManager.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/ModelDataManager.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.google.common.base.Preconditions; import net.minecraftforge.client.model.data.IModelData; diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IDynamicBakedModel.java b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IDynamicBakedModel.java index 958e3f5c..e5ba545b 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IDynamicBakedModel.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IDynamicBakedModel.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Random; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.client.extensions.IForgeBakedModel; @@ -37,13 +37,13 @@ */ public interface IDynamicBakedModel extends BakedModel, IForgeBakedModel { @Override - default @Nonnull List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand) { + default @NotNull List getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull Random rand) { return getQuads(state, side, rand, EmptyModelData.INSTANCE); } // Force this to be overriden otherwise this introduces a default cycle between // the two overloads. @Override - @Nonnull - List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData); + @NotNull + List getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull Random rand, @NotNull IModelData extraData); } diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IModelData.java b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IModelData.java index d9e153de..11bd613c 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IModelData.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/minecraftforge/client/model/data/IModelData.java @@ -19,7 +19,7 @@ package net.minecraftforge.client.model.data; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public interface IModelData { /** diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ForgeModelDataProvider.java b/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ForgeModelDataProvider.java index 4a2b3b36..c424af95 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ForgeModelDataProvider.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ForgeModelDataProvider.java @@ -19,7 +19,7 @@ package net.patchworkmc.impl.extensions.bakedmodel; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; @@ -33,7 +33,7 @@ public interface ForgeModelDataProvider { * * @return Your model data */ - @Nonnull + @NotNull default IModelData getModelData() { return EmptyModelData.INSTANCE; } diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ModelDataParameter.java b/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ModelDataParameter.java index cc7b4797..78cadad3 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ModelDataParameter.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/impl/extensions/bakedmodel/ModelDataParameter.java @@ -21,7 +21,7 @@ import java.util.Stack; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; @@ -50,7 +50,7 @@ public class ModelDataParameter { * If this is not called, the behavior of Vanilla method should not be changed, the additional parameter is assumed to * have the default value: {@link #DEFAULT}. */ - public void setFuncParam(@Nonnull IModelData modelData) { + public void setFuncParam(@NotNull IModelData modelData) { if (modelDataParam.get() == null) { modelDataParam.set(modelData); } else { diff --git a/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/mixin/extensions/bakedmodel/MixinChunkRenderTask.java b/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/mixin/extensions/bakedmodel/MixinChunkRenderTask.java index 85d1aa24..d78f5a5b 100644 --- a/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/mixin/extensions/bakedmodel/MixinChunkRenderTask.java +++ b/patchwork-extensions-bakedmodel/src/main/java/net/patchworkmc/mixin/extensions/bakedmodel/MixinChunkRenderTask.java @@ -21,7 +21,7 @@ import java.util.Map; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/patchwork-extensions-block/src/main/block/BlockHarvestManager.java b/patchwork-extensions-block/src/main/block/BlockHarvestManager.java index 0f7f4082..83c2cd0e 100644 --- a/patchwork-extensions-block/src/main/block/BlockHarvestManager.java +++ b/patchwork-extensions-block/src/main/block/BlockHarvestManager.java @@ -21,7 +21,7 @@ import java.util.Stack; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.ToolType; @@ -76,7 +76,7 @@ public static int popExpDropStack() { * Requires harvest levels. */ @SuppressWarnings("unused") - public static boolean canHarvestBlock(@Nonnull BlockState state, @Nonnull PlayerEntity player, @Nonnull BlockView world, @Nonnull BlockPos pos) { + public static boolean canHarvestBlock(@NotNull BlockState state, @NotNull PlayerEntity player, @NotNull BlockView world, @NotNull BlockPos pos) { // state = state.getActualState(world, pos); if (state.getMaterial().canBreakByHand()) { return true; diff --git a/patchwork-extensions-block/src/main/block/MixinBedBlock.java b/patchwork-extensions-block/src/main/block/MixinBedBlock.java index 41ae645e..9eeb934c 100644 --- a/patchwork-extensions-block/src/main/block/MixinBedBlock.java +++ b/patchwork-extensions-block/src/main/block/MixinBedBlock.java @@ -19,7 +19,7 @@ package net.patchworkmc.mixin.extensions.block; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import net.minecraftforge.common.extensions.IForgeBlock; diff --git a/patchwork-extensions-block/src/main/block/harvest/MixinServerPlayerInteractionManager.java b/patchwork-extensions-block/src/main/block/harvest/MixinServerPlayerInteractionManager.java index fac0991f..10f57565 100644 --- a/patchwork-extensions-block/src/main/block/harvest/MixinServerPlayerInteractionManager.java +++ b/patchwork-extensions-block/src/main/block/harvest/MixinServerPlayerInteractionManager.java @@ -19,7 +19,7 @@ package net.patchworkmc.mixin.extensions.block.harvest; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; diff --git a/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index 0a6df320..e6a1f662 100644 --- a/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -22,10 +22,9 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.Nullable; - import net.minecraftforge.common.ToolType; import org.apache.commons.lang3.NotImplementedException; +import org.jetbrains.annotations.Nullable; import net.minecraft.block.BedBlock; import net.minecraft.block.Block; diff --git a/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlockState.java b/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlockState.java index e21e0121..15839736 100644 --- a/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlockState.java +++ b/patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlockState.java @@ -21,10 +21,9 @@ import java.util.Optional; -import javax.annotation.Nullable; - import net.minecraftforge.common.ToolType; import org.apache.commons.lang3.NotImplementedException; +import org.jetbrains.annotations.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/patchwork-extensions-block/src/main/resources/patchwork-extensions-block.mixins.json b/patchwork-extensions-block/src/main/resources/patchwork-extensions-block.mixins.json index 0011540c..eaa97b24 100644 --- a/patchwork-extensions-block/src/main/resources/patchwork-extensions-block.mixins.json +++ b/patchwork-extensions-block/src/main/resources/patchwork-extensions-block.mixins.json @@ -3,9 +3,9 @@ "package": "net.patchworkmc.mixin.extensions.block", "compatibilityLevel": "JAVA_8", "mixins": [ + "MixinAbstractBlock", "MixinBlock", "MixinBlockState", - "MixinAbstractBlock", "MixinWorldChunk" ], "injectors": { diff --git a/patchwork-extensions-blockentity/src/main/resources/patchwork-extensions-blockentity.mixins.json b/patchwork-extensions-blockentity/src/main/resources/patchwork-extensions-blockentity.mixins.json index ec5fd316..e9f0ba68 100644 --- a/patchwork-extensions-blockentity/src/main/resources/patchwork-extensions-blockentity.mixins.json +++ b/patchwork-extensions-blockentity/src/main/resources/patchwork-extensions-blockentity.mixins.json @@ -7,8 +7,8 @@ "MixinWorld" ], "client": [ - "MixinClientPlayNetworkHandler", "MixinBlockEntityRenderer", + "MixinClientPlayNetworkHandler", "MixinWorldRenderer" ], "injectors": { diff --git a/patchwork-extensions-entity/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java b/patchwork-extensions-entity/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java index 9c8fa2c7..799af2ff 100644 --- a/patchwork-extensions-entity/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java +++ b/patchwork-extensions-entity/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java @@ -21,9 +21,8 @@ import java.util.Collection; -import javax.annotation.Nullable; - import org.apache.commons.lang3.NotImplementedException; +import org.jetbrains.annotations.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/patchwork-extensions-entity/src/main/java/net/patchworkmc/mixin/extensions/entity/MixinEntity.java b/patchwork-extensions-entity/src/main/java/net/patchworkmc/mixin/extensions/entity/MixinEntity.java index a3bd852d..c207a2d2 100644 --- a/patchwork-extensions-entity/src/main/java/net/patchworkmc/mixin/extensions/entity/MixinEntity.java +++ b/patchwork-extensions-entity/src/main/java/net/patchworkmc/mixin/extensions/entity/MixinEntity.java @@ -21,9 +21,8 @@ import java.util.Collection; -import javax.annotation.Nullable; - import net.minecraftforge.common.extensions.IForgeEntity; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; diff --git a/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java b/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java index 61d35eb7..fb721d72 100644 --- a/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java +++ b/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java @@ -24,11 +24,10 @@ import java.util.Set; import java.util.function.Consumer; -import javax.annotation.Nullable; - import com.google.common.collect.Multimap; import net.minecraftforge.common.ToolType; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import org.jetbrains.annotations.Nullable; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java b/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java index c954dc54..c5cd799d 100644 --- a/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java +++ b/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java @@ -21,9 +21,8 @@ import java.util.Set; -import javax.annotation.Nullable; - import net.minecraftforge.common.ToolType; +import org.jetbrains.annotations.Nullable; import net.minecraft.block.BlockState; import net.minecraft.block.pattern.CachedBlockPosition; diff --git a/patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkArmorItemHandler.java.old b/patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkArmorItemHandler.java.old index 1f8ab4dc..6ed8c445 100644 --- a/patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkArmorItemHandler.java.old +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkArmorItemHandler.java.old @@ -19,7 +19,7 @@ package net.patchworkmc.impl.extensions.item; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.common.extensions.IForgeItem; diff --git a/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java index 7628ac8c..165cfd37 100644 --- a/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java @@ -22,12 +22,11 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; - import com.google.common.collect.Maps; import net.minecraftforge.common.ToolType; import net.minecraftforge.common.extensions.IForgeItem; import net.minecraftforge.common.util.ReverseTagWrapper; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinArmorFeatureRenderer.java.old b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinArmorFeatureRenderer.java.old index fae66d0a..e66ceeba 100644 --- a/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinArmorFeatureRenderer.java.old +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinArmorFeatureRenderer.java.old @@ -21,7 +21,7 @@ package net.patchworkmc.mixin.extensions.item.client; import java.util.Map; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Final; diff --git a/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java index 5009eecd..1d205724 100644 --- a/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java @@ -19,9 +19,8 @@ package net.patchworkmc.mixin.extensions.item.client; -import javax.annotation.Nullable; - import net.minecraftforge.common.extensions.IForgeItem; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/patchwork-fml/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java b/patchwork-fml/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java index 0d972dcc..93b0fd1a 100644 --- a/patchwork-fml/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java +++ b/patchwork-fml/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java @@ -35,8 +35,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Nonnull; - import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.ConfigSpec; @@ -53,6 +51,7 @@ import net.minecraftforge.fml.loading.LogMarkers; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; +import org.jetbrains.annotations.NotNull; /** * Like {@link com.electronwill.nightconfig.core.ConfigSpec} except in builder format, and extended to accept comments, language keys, @@ -596,7 +595,7 @@ public interface BuilderConsumer { } private static class BuilderContext { - private @Nonnull + private @NotNull String[] comment = new String[0]; private String langKey; private Range range; diff --git a/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java.old b/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java.old index 65b4bfe7..a12b5e2a 100644 --- a/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java.old +++ b/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java.old @@ -24,8 +24,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.StringJoiner; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.base.Preconditions; import cpw.mods.modlauncher.api.INameMappingService; @@ -58,7 +58,7 @@ public class ObfuscationReflectionHelper { * @return The remapped name, or the original name if it couldn't be remapped. * @deprecated Fabric mods should use {@link PatchworkMappingService#remapName(INameMappingService.Domain, String)} instead. */ - @Nonnull + @NotNull @Deprecated public static String remapName(INameMappingService.Domain domain, String name) { return PatchworkMappingService.remapName(domain, name); @@ -142,7 +142,7 @@ public class ObfuscationReflectionHelper { * Forge: TODO Remove in 1.15 */ @Deprecated - public static void setPrivateValue(@Nonnull final Class classToAccess, @Nonnull final T instance, @Nullable final E value, int fieldIndex) { + public static void setPrivateValue(@NotNull final Class classToAccess, @NotNull final T instance, @Nullable final E value, int fieldIndex) { try { findField(classToAccess, fieldIndex).set(instance, value); } catch (IllegalAccessException e) { @@ -166,8 +166,8 @@ public class ObfuscationReflectionHelper { * @throws UnableToFindFieldException If there was a problem getting the field. * @throws UnableToAccessFieldException If there was a problem setting the value of the field. */ - public static void setPrivateValue(@Nonnull final Class classToAccess, @Nonnull final T instance, - @Nullable final E value, @Nonnull final String fieldName) { + public static void setPrivateValue(@NotNull final Class classToAccess, @NotNull final T instance, + @Nullable final E value, @NotNull final String fieldName) { try { findField(classToAccess, fieldName).set(instance, value); } catch (UnableToFindFieldException e) { @@ -195,8 +195,8 @@ public class ObfuscationReflectionHelper { * @throws NullPointerException If {@code parameterTypes} is null. * @throws UnableToFindMethodException If the method could not be found. */ - @Nonnull - public static Method findMethod(@Nonnull final Class clazz, @Nonnull final String methodName, @Nonnull final Class... parameterTypes) { + @NotNull + public static Method findMethod(@NotNull final Class clazz, @NotNull final String methodName, @NotNull final Class... parameterTypes) { Preconditions.checkNotNull(clazz, "Class to find method on cannot be null."); Preconditions.checkNotNull(methodName, "Name of method to find cannot be null."); Preconditions.checkArgument(!methodName.isEmpty(), "Name of method to find cannot be empty."); @@ -226,8 +226,8 @@ public class ObfuscationReflectionHelper { * @throws NullPointerException If {@code parameterTypes} is null. * @throws UnknownConstructorException If the constructor could not be found. */ - @Nonnull - public static Constructor findConstructor(@Nonnull final Class clazz, @Nonnull final Class... parameterTypes) { + @NotNull + public static Constructor findConstructor(@NotNull final Class clazz, @NotNull final Class... parameterTypes) { Preconditions.checkNotNull(clazz, "Class to find constructor on cannot be null."); Preconditions.checkNotNull(parameterTypes, "Parameter types of constructor to find cannot be null."); @@ -266,8 +266,8 @@ public class ObfuscationReflectionHelper { * @throws IllegalArgumentException If {@code fieldName} is empty. * @throws UnableToFindFieldException If the field could not be found. */ - @Nonnull - public static Field findField(@Nonnull final Class clazz, @Nonnull final String fieldName) { + @NotNull + public static Field findField(@NotNull final Class clazz, @NotNull final String fieldName) { Preconditions.checkNotNull(clazz, "Class to find field on cannot be null."); Preconditions.checkNotNull(fieldName, "Name of field to find cannot be null."); Preconditions.checkArgument(!fieldName.isEmpty(), "Name of field to find cannot be empty."); @@ -298,7 +298,7 @@ public class ObfuscationReflectionHelper { * TODO: Remove in 1.15 */ @Deprecated - @Nonnull + @NotNull public static Field findField(final Class clazz, final int fieldIndex) { Preconditions.checkNotNull(clazz, "Class to find field on cannot be null."); diff --git a/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java.old b/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java.old index 05886798..6df54951 100644 --- a/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java.old +++ b/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java.old @@ -19,8 +19,8 @@ package net.patchworkmc.impl.fml; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import cpw.mods.modlauncher.api.INameMappingService; @@ -47,7 +47,7 @@ public class PatchworkMappingService { * @param name The name to try and remap. * @return The remapped name, or the original name if it couldn't be remapped. */ - @Nonnull + @NotNull public static String remapName(INameMappingService.Domain domain, String name) { if (runtimeNamespaceIsIntermediary()) { return name; @@ -77,7 +77,7 @@ public class PatchworkMappingService { * @param name The name to remap. * @return The remapped name, or the original name if it couldn't be remapped. */ - @Nonnull + @NotNull public static String remapNameFast(INameMappingService.Domain domain, Class clazz, String name) { if (runtimeNamespaceIsIntermediary()) { return name; diff --git a/patchwork-god-classes/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/patchwork-god-classes/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 73afcc72..c9fbb36c 100644 --- a/patchwork-god-classes/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/patchwork-god-classes/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import org.apache.commons.lang3.NotImplementedException; @@ -351,7 +351,7 @@ public static BakedModel getDamageModel(BakedModel ibakedmodel, Sprite texture, } */ @Stubbed - public static boolean shouldCauseReequipAnimation(@Nonnull ItemStack from, @Nonnull ItemStack to, int slot) { + public static boolean shouldCauseReequipAnimation(@NotNull ItemStack from, @NotNull ItemStack to, int slot) { throw new NotImplementedException("ForgeHooksClient stub"); } diff --git a/patchwork-god-classes/src/main/java/net/minecraftforge/common/ForgeHooks.java b/patchwork-god-classes/src/main/java/net/minecraftforge/common/ForgeHooks.java index 20546a6d..f9957cc0 100644 --- a/patchwork-god-classes/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/patchwork-god-classes/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -97,24 +97,24 @@ public class ForgeHooks { //private static TriConsumer blockToolSetter; @Stubbed - public static boolean canContinueUsing(@Nonnull ItemStack from, @Nonnull ItemStack to) { + public static boolean canContinueUsing(@NotNull ItemStack from, @NotNull ItemStack to) { throw new NotImplementedException("ForgeHooks stub"); } @Stubbed - public static boolean canHarvestBlock(@Nonnull BlockState state, @Nonnull PlayerEntity player, @Nonnull BlockView world, @Nonnull BlockPos pos) { + public static boolean canHarvestBlock(@NotNull BlockState state, @NotNull PlayerEntity player, @NotNull BlockView world, @NotNull BlockPos pos) { throw new NotImplementedException("ForgeHooks stub"); } /* @Stubbed - public static boolean canToolHarvestBlock(ViewableWorld world, BlockPos pos, @Nonnull ItemStack stack) { + public static boolean canToolHarvestBlock(ViewableWorld world, BlockPos pos, @NotNull ItemStack stack) { throw new NotImplementedException("ForgeHooks stub"); } */ /* @Stubbed - public static boolean isToolEffective(ViewableWorld world, BlockPos pos, @Nonnull ItemStack stack) { + public static boolean isToolEffective(ViewableWorld world, BlockPos pos, @NotNull ItemStack stack) { throw new NotImplementedException("ForgeHooks stub"); } */ @@ -199,7 +199,7 @@ public static double getPlayerVisibilityDistance(PlayerEntity player, double xzD } @Stubbed - public static boolean isLivingOnLadder(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull LivingEntity entity) { + public static boolean isLivingOnLadder(@NotNull BlockState state, @NotNull World world, @NotNull BlockPos pos, @NotNull LivingEntity entity) { throw new NotImplementedException("ForgeHooks stub"); } @@ -209,7 +209,7 @@ public static void onLivingJump(LivingEntity entity) { } @Nullable - public static ItemEntity onPlayerTossEvent(@Nonnull PlayerEntity player, @Nonnull ItemStack item, boolean includeName) { + public static ItemEntity onPlayerTossEvent(@NotNull PlayerEntity player, @NotNull ItemStack item, boolean includeName) { // EntityEvents.onPlayerTossEvent is called through an Inject mixin into PlayerEntity.dropItem return player.dropItem(item, false, includeName); } @@ -234,16 +234,16 @@ public static int onBlockBreakEvent(World world, GameMode gameType, ServerPlayer } @Stubbed - public static ActionResult onPlaceItemIntoWorld(@Nonnull ItemUsageContext context) { + public static ActionResult onPlaceItemIntoWorld(@NotNull ItemUsageContext context) { throw new NotImplementedException("ForgeHooks stub"); } - public static boolean onAnvilChange(AnvilScreenHandler container, @Nonnull ItemStack left, @Nonnull ItemStack right, Inventory outputSlot, String name, int baseCost) { + public static boolean onAnvilChange(AnvilScreenHandler container, @NotNull ItemStack left, @NotNull ItemStack right, Inventory outputSlot, String name, int baseCost) { throw new NotImplementedException("ForgeHooks stub"); } @Stubbed - public static float onAnvilRepair(PlayerEntity player, @Nonnull ItemStack output, @Nonnull ItemStack left, @Nonnull ItemStack right) { + public static float onAnvilRepair(PlayerEntity player, @NotNull ItemStack output, @NotNull ItemStack left, @NotNull ItemStack right) { throw new NotImplementedException("ForgeHooks stub"); } @@ -258,8 +258,8 @@ public static void setCraftingPlayer(PlayerEntity player) { } @Stubbed - @Nonnull - public static ItemStack getContainerItem(@Nonnull ItemStack stack) { + @NotNull + public static ItemStack getContainerItem(@NotNull ItemStack stack) { throw new NotImplementedException("ForgeHooks stub"); } @@ -362,7 +362,7 @@ public static void onAdvancement(ServerPlayerEntity player, Advancement advancem */ @Stubbed @Nullable - public static String getDefaultCreatorModId(@Nonnull ItemStack itemStack) { + public static String getDefaultCreatorModId(@NotNull ItemStack itemStack) { throw new NotImplementedException("ForgeHooks stub"); } @@ -463,7 +463,7 @@ private LootTableContext(Identifier name, boolean custom) { // } // // @Override - // public boolean applyTagGetter(@Nonnull Function> resolver) { + // public boolean applyTagGetter(@NotNull Function> resolver) { // if (this.resolvedTag == null) { // this.resolvedTag = resolver.apply(this.getId()); // } @@ -471,7 +471,7 @@ private LootTableContext(Identifier name, boolean custom) { // } // // @Override - // public void build(@Nonnull Collection items) { + // public void build(@NotNull Collection items) { // if (this.resolvedTag != null) { // items.addAll(this.resolvedTag.values()); // } diff --git a/patchwork-god-classes/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/patchwork-god-classes/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index db7d20ed..97aaf6d3 100644 --- a/patchwork-god-classes/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/patchwork-god-classes/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -24,8 +24,8 @@ import java.util.Optional; import java.util.Random; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.common.capabilities.CapabilityDispatcher; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -92,7 +92,7 @@ public static boolean onMultiBlockPlace(@Nullable Entity entity, List onBucketUse(@Nonnull PlayerEntity player, @Nonnull World world, @Nonnull ItemStack stack, @Nullable HitResult target) { + public static TypedActionResult onBucketUse(@NotNull PlayerEntity player, @NotNull World world, @NotNull ItemStack stack, @Nullable HitResult target) { throw new NotImplementedException("ForgeEventFactory stub"); } @@ -272,7 +272,7 @@ public static PlaySoundAtEntityEvent onPlaySoundAtEntity(Entity entity, SoundEve throw new NotImplementedException("ForgeEventFactory stub"); } */ - public static int onItemExpire(ItemEntity entity, @Nonnull ItemStack item) { + public static int onItemExpire(ItemEntity entity, @NotNull ItemStack item) { return EntityEvents.onItemExpire(entity, item); } diff --git a/patchwork-god-classes/src/main/java/net/minecraftforge/fml/client/ClientHooks.java b/patchwork-god-classes/src/main/java/net/minecraftforge/fml/client/ClientHooks.java index 8da3fcce..e262d861 100644 --- a/patchwork-god-classes/src/main/java/net/minecraftforge/fml/client/ClientHooks.java +++ b/patchwork-god-classes/src/main/java/net/minecraftforge/fml/client/ClientHooks.java @@ -21,7 +21,7 @@ import java.io.File; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.apache.commons.lang3.NotImplementedException; diff --git a/patchwork-gui/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java b/patchwork-gui/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java index 399e9f20..1ce6f77b 100644 --- a/patchwork-gui/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java +++ b/patchwork-gui/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java @@ -28,10 +28,10 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; -import net.minecraft.client.util.InputUtil; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import net.fabricmc.api.EnvType; diff --git a/patchwork-gui/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java b/patchwork-gui/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java index d0019493..6bc02aac 100644 --- a/patchwork-gui/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java +++ b/patchwork-gui/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java @@ -22,13 +22,13 @@ import com.mojang.blaze3d.systems.RenderSystem; import org.lwjgl.opengl.GL11; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Matrix4f; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; +import net.minecraft.util.math.Matrix4f; /** * This class provides several methods and constants used by the Config GUI classes. diff --git a/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java index 5edad99b..ec2518ca 100644 --- a/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java @@ -29,9 +29,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.util.math.MatrixStack; @Mixin(GameRenderer.class) public abstract class MixinGameRenderer { diff --git a/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMinecraftClient.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMinecraftClient.java index a1433df5..f0d71d53 100644 --- a/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMinecraftClient.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMinecraftClient.java @@ -19,6 +19,8 @@ package net.patchworkmc.mixin.gui; +import net.minecraftforge.client.event.GuiOpenEvent; +import net.minecraftforge.common.MinecraftForge; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -27,8 +29,6 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraftforge.client.event.GuiOpenEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; diff --git a/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java index f335b768..7e550c1d 100644 --- a/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java @@ -22,10 +22,9 @@ import java.util.List; import java.util.function.Consumer; -import javax.annotation.Nullable; - import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.common.MinecraftForge; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -34,11 +33,11 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.util.math.MatrixStack; import net.patchworkmc.impl.gui.ForgeScreen; diff --git a/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandler.java b/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandler.java index 50361b3a..3fc2fe7c 100644 --- a/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandler.java +++ b/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandler.java @@ -19,7 +19,7 @@ package net.minecraftforge.items; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; @@ -48,7 +48,7 @@ public interface IItemHandler { * @param slot Slot to query * @return ItemStack in given slot. Empty Itemstack if the slot is empty. */ - @Nonnull + @NotNull ItemStack getStackInSlot(int slot); /** @@ -64,8 +64,8 @@ public interface IItemHandler { * May be the same as the input ItemStack if unchanged, otherwise a new ItemStack. * The returned ItemStack can be safely modified after. */ - @Nonnull - ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate); + @NotNull + ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate); /** * Extracts an ItemStack from the given slot. @@ -79,7 +79,7 @@ public interface IItemHandler { * @return ItemStack extracted from the slot, must be empty if nothing can be extracted. * The returned ItemStack can be safely modified after, so item handlers should return a new or copied stack. */ - @Nonnull + @NotNull ItemStack extractItem(int slot, int amount, boolean simulate); /** @@ -108,5 +108,5 @@ public interface IItemHandler { * @return true if the slot can insert the ItemStack, not considering the current state of the inventory. * false if the slot can never insert the ItemStack in any situation. */ - boolean isItemValid(int slot, @Nonnull ItemStack stack); + boolean isItemValid(int slot, @NotNull ItemStack stack); } diff --git a/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandlerModifiable.java b/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandlerModifiable.java index e24731cc..dc2d8995 100644 --- a/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandlerModifiable.java +++ b/patchwork-items/src/main/java/net/minecraftforge/items/IItemHandlerModifiable.java @@ -19,7 +19,7 @@ package net.minecraftforge.items; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraft.item.ItemStack; @@ -35,5 +35,5 @@ public interface IItemHandlerModifiable extends IItemHandler { * @throws RuntimeException if the handler is called in a way that the handler * was not expecting. */ - void setStackInSlot(int slot, @Nonnull ItemStack stack); + void setStackInSlot(int slot, @NotNull ItemStack stack); } diff --git a/patchwork-items/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java b/patchwork-items/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java index 9fc6ed38..7f9cca98 100644 --- a/patchwork-items/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java +++ b/patchwork-items/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java @@ -19,8 +19,8 @@ package net.minecraftforge.items; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; @@ -32,8 +32,8 @@ public class ItemHandlerHelper { return ((CapabilityProviderHolder) (Object) a).areCapsCompatible(((CapabilityProviderHolder) (Object) b).getCapabilityProvider()); } - @Nonnull - public static ItemStack insertItem(IItemHandler dest, @Nonnull ItemStack stack, boolean simulate) { + @NotNull + public static ItemStack insertItem(IItemHandler dest, @NotNull ItemStack stack, boolean simulate) { if (dest == null || stack.isEmpty()) { return stack; } @@ -49,7 +49,7 @@ public static ItemStack insertItem(IItemHandler dest, @Nonnull ItemStack stack, return stack; } - public static boolean canItemStacksStack(@Nonnull ItemStack a, @Nonnull ItemStack b) { + public static boolean canItemStacksStack(@NotNull ItemStack a, @NotNull ItemStack b) { if (a.isEmpty() || !a.isItemEqualIgnoreDamage(b) || a.hasTag() != b.hasTag()) { return false; } @@ -61,7 +61,7 @@ public static boolean canItemStacksStack(@Nonnull ItemStack a, @Nonnull ItemStac * A relaxed version of canItemStacksStack that stacks itemstacks with different metadata if they don't have subtypes. * This usually only applies when players pick up items. */ - public static boolean canItemStacksStackRelaxed(@Nonnull ItemStack a, @Nonnull ItemStack b) { + public static boolean canItemStacksStackRelaxed(@NotNull ItemStack a, @NotNull ItemStack b) { if (a.isEmpty() || b.isEmpty() || a.getItem() != b.getItem()) { return false; } @@ -77,8 +77,8 @@ public static boolean canItemStacksStackRelaxed(@Nonnull ItemStack a, @Nonnull I return (!a.hasTag() || a.getTag().equals(b.getTag())) && patchwork$areItemStackCapsCompatible(a, b); } - @Nonnull - public static ItemStack copyStackWithSize(@Nonnull ItemStack itemStack, int size) { + @NotNull + public static ItemStack copyStackWithSize(@NotNull ItemStack itemStack, int size) { if (size == 0) { return ItemStack.EMPTY; } @@ -93,8 +93,8 @@ public static ItemStack copyStackWithSize(@Nonnull ItemStack itemStack, int size * This is equivalent to the behaviour of a player picking up an item. * Note: This function stacks items without subtypes with different metadata together. */ - @Nonnull - public static ItemStack insertItemStacked(IItemHandler inventory, @Nonnull ItemStack stack, boolean simulate) { + @NotNull + public static ItemStack insertItemStacked(IItemHandler inventory, @NotNull ItemStack stack, boolean simulate) { if (inventory == null || stack.isEmpty()) { return stack; } @@ -141,7 +141,7 @@ public static ItemStack insertItemStacked(IItemHandler inventory, @Nonnull ItemS */ /* TODO: PlayerMainInvWrapper - public static void giveItemToPlayer(PlayerEntity player, @Nonnull ItemStack stack) { + public static void giveItemToPlayer(PlayerEntity player, @NotNull ItemStack stack) { giveItemToPlayer(player, stack, -1); }*/ @@ -154,7 +154,7 @@ public static void giveItemToPlayer(PlayerEntity player, @Nonnull ItemStack stac */ /* TODO: PlayerMainInvWrapper - public static void giveItemToPlayer(PlayerEntity player, @Nonnull ItemStack stack, int preferredSlot) { + public static void giveItemToPlayer(PlayerEntity player, @NotNull ItemStack stack, int preferredSlot) { if (stack.isEmpty()) return; IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); diff --git a/patchwork-items/src/main/java/net/minecraftforge/items/ItemStackHandler.java b/patchwork-items/src/main/java/net/minecraftforge/items/ItemStackHandler.java index ff98c63b..3f5242ae 100644 --- a/patchwork-items/src/main/java/net/minecraftforge/items/ItemStackHandler.java +++ b/patchwork-items/src/main/java/net/minecraftforge/items/ItemStackHandler.java @@ -19,7 +19,7 @@ package net.minecraftforge.items; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraftforge.common.util.INBTSerializable; @@ -49,7 +49,7 @@ public void setSize(int size) { } @Override - public void setStackInSlot(int slot, @Nonnull ItemStack stack) { + public void setStackInSlot(int slot, @NotNull ItemStack stack) { validateSlotIndex(slot); this.stacks.set(slot, stack); onContentsChanged(slot); @@ -61,15 +61,15 @@ public int getSlots() { } @Override - @Nonnull + @NotNull public ItemStack getStackInSlot(int slot) { validateSlotIndex(slot); return this.stacks.get(slot); } @Override - @Nonnull - public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + @NotNull + public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) { if (stack.isEmpty()) { return ItemStack.EMPTY; } @@ -112,7 +112,7 @@ public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate } @Override - @Nonnull + @NotNull public ItemStack extractItem(int slot, int amount, boolean simulate) { if (amount == 0) { return ItemStack.EMPTY; @@ -150,12 +150,12 @@ public int getSlotLimit(int slot) { return 64; } - protected int getStackLimit(int slot, @Nonnull ItemStack stack) { + protected int getStackLimit(int slot, @NotNull ItemStack stack) { return Math.min(getSlotLimit(slot), stack.getMaxCount()); } @Override - public boolean isItemValid(int slot, @Nonnull ItemStack stack) { + public boolean isItemValid(int slot, @NotNull ItemStack stack) { return true; } diff --git a/patchwork-key-bindings/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java b/patchwork-key-bindings/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java index 473a0139..f4962c09 100644 --- a/patchwork-key-bindings/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java +++ b/patchwork-key-bindings/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java @@ -19,10 +19,9 @@ package net.minecraftforge.client.extensions; -import javax.annotation.Nonnull; - import net.minecraftforge.client.settings.IKeyConflictContext; import net.minecraftforge.client.settings.KeyModifier; +import org.jetbrains.annotations.NotNull; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.util.InputUtil; @@ -32,7 +31,7 @@ default KeyBinding getKeyBinding() { return (KeyBinding) this; } - @Nonnull + @NotNull InputUtil.Key getKey(); /** diff --git a/patchwork-key-bindings/src/main/java/net/minecraftforge/client/settings/KeyModifier.java b/patchwork-key-bindings/src/main/java/net/minecraftforge/client/settings/KeyModifier.java index 334cd990..31e9ad89 100644 --- a/patchwork-key-bindings/src/main/java/net/minecraftforge/client/settings/KeyModifier.java +++ b/patchwork-key-bindings/src/main/java/net/minecraftforge/client/settings/KeyModifier.java @@ -21,15 +21,14 @@ import java.util.function.Supplier; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.lwjgl.glfw.GLFW; -import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; public enum KeyModifier { CONTROL { diff --git a/patchwork-loot/src/main/java/net/patchworkmc/impl/loot/LootHooks.java b/patchwork-loot/src/main/java/net/patchworkmc/impl/loot/LootHooks.java index 88a5d840..0d560efe 100644 --- a/patchwork-loot/src/main/java/net/patchworkmc/impl/loot/LootHooks.java +++ b/patchwork-loot/src/main/java/net/patchworkmc/impl/loot/LootHooks.java @@ -22,7 +22,7 @@ import java.util.Deque; import java.util.HashSet; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Queues; import com.google.common.collect.Sets; diff --git a/patchwork-model-loader/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/patchwork-model-loader/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 54dcafca..3d9e529e 100644 --- a/patchwork-model-loader/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/patchwork-model-loader/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java index 90ecac94..30426c61 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java @@ -22,8 +22,8 @@ import java.util.function.BiFunction; import java.util.function.Supplier; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.fml.LogicalSide; import org.apache.commons.lang3.tuple.Pair; @@ -54,7 +54,7 @@ public enum NetworkDirection { this.otherWay = i; } - @Nonnull + @NotNull public NetworkDirection reply() { return NetworkDirection.values()[this.otherWay]; } @@ -63,12 +63,12 @@ public NetworkEvent getEvent(final ICustomPacket buffer, final Supplier> clazz) { } } - @Nonnull + @NotNull @SuppressWarnings("unchecked") private > ICustomPacket construct() { switch (this) { @@ -107,7 +107,7 @@ private > ICustomPacket construct() { } } - @Nonnull + @NotNull public > ICustomPacket buildPacket(Pair packetData, Identifier channelName) { ICustomPacket packet = construct(); diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java index b3facab9..3b86ebd2 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import io.netty.util.Attribute; import io.netty.util.AttributeKey; diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java index d4a0a978..42dbd6f0 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java @@ -27,7 +27,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.fml.network.event.EventNetworkChannel; import net.minecraftforge.fml.network.simple.SimpleChannel; diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/IndexedMessageCodec.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/IndexedMessageCodec.java index f881ea09..6c691ac8 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/IndexedMessageCodec.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/IndexedMessageCodec.java @@ -24,7 +24,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import it.unimi.dsi.fastutil.shorts.Short2ObjectArrayMap; diff --git a/patchwork-recipes/src/main/resources/patchwork-recipes.mixins.json b/patchwork-recipes/src/main/resources/patchwork-recipes.mixins.json index ff098636..1e5bccf7 100644 --- a/patchwork-recipes/src/main/resources/patchwork-recipes.mixins.json +++ b/patchwork-recipes/src/main/resources/patchwork-recipes.mixins.json @@ -4,8 +4,8 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "MixinRecipeGridAligner", - "MixinShapedRecipe", - "MixinRecipeManager" + "MixinRecipeManager", + "MixinShapedRecipe" ], "injectors": { "defaultRequire": 1 diff --git a/patchwork-registries/src/main/java/net/minecraftforge/fml/RegistryObject.java b/patchwork-registries/src/main/java/net/minecraftforge/fml/RegistryObject.java index f62e8ac7..56f6e0c4 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/fml/RegistryObject.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/fml/RegistryObject.java @@ -27,12 +27,11 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.RegistryManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import net.minecraft.util.Identifier; @@ -92,7 +91,7 @@ private > RegistryObject(final Identifier name, * Will throw NPE if the value is null, use isPresent to check first. Or use any of the other guarded functions. */ @Override - @Nonnull + @NotNull public T get() { T ret = this.value; Objects.requireNonNull(ret, () -> "Registry Object not present: " + this.name); diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistry.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistry.java index c997ba21..16244701 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistry.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistry.java @@ -29,8 +29,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nonnull; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; @@ -240,7 +238,7 @@ public Identifier getDefaultKey() { } @Override - @Nonnull + @NotNull public Iterator iterator() { return vanilla.stream().iterator(); } diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryBuilder.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryBuilder.java index 6c24c144..a7394f51 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryBuilder.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryBuilder.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.Set; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import net.minecraftforge.registries.IForgeRegistry.AddCallback; import net.minecraftforge.registries.IForgeRegistry.BakeCallback; import net.minecraftforge.registries.IForgeRegistry.ClearCallback; @@ -33,6 +31,8 @@ import net.minecraftforge.registries.IForgeRegistry.DummyFactory; import net.minecraftforge.registries.IForgeRegistry.MissingFactory; import net.minecraftforge.registries.IForgeRegistry.ValidateCallback; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; import net.minecraft.util.Identifier; diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java index fde4e6f6..35ef60b2 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java @@ -24,12 +24,12 @@ import java.util.Map; import java.util.Set; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; diff --git a/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java index 8e79c8b0..be8a8aa6 100644 --- a/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java @@ -21,10 +21,8 @@ import java.util.Objects; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - import net.minecraftforge.registries.GameData; +import org.jetbrains.annotations.Nullable; import net.minecraft.util.Identifier; import net.minecraft.util.registry.DefaultedRegistry; @@ -34,7 +32,6 @@ /** * Not every registry entry is registered the Forge way, so we need to delegate to Vanilla. */ -@ParametersAreNonnullByDefault public class Identifiers { private Identifiers() { } diff --git a/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java index 27145039..e1ab0814 100644 --- a/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java @@ -29,8 +29,8 @@ import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.RegistryManager; -import net.minecraft.util.registry.Registry; import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; @SuppressWarnings("rawtypes") public class RegistryEventDispatcher { diff --git a/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinInt2ObjectBiMap.java.old b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinInt2ObjectBiMap.java.old index 6408fc90..27d86f63 100644 --- a/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinInt2ObjectBiMap.java.old +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinInt2ObjectBiMap.java.old @@ -19,7 +19,7 @@ package net.patchworkmc.mixin.registries; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/patchwork-registries/src/main/resources/patchwork-registries.mixins.json b/patchwork-registries/src/main/resources/patchwork-registries.mixins.json index 5c9e97e6..434def30 100644 --- a/patchwork-registries/src/main/resources/patchwork-registries.mixins.json +++ b/patchwork-registries/src/main/resources/patchwork-registries.mixins.json @@ -4,9 +4,9 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "MixinAllForgeRegistryEntries", - "MixinSimpleRegistry", "MixinRecipeSerializer", - "MixinRecipeSerializerSubclass" + "MixinRecipeSerializerSubclass", + "MixinSimpleRegistry" ], "client": [ ], diff --git a/patchwork-resource/src/main/java/net/minecraftforge/resource/SelectiveReloadStateHandler.java b/patchwork-resource/src/main/java/net/minecraftforge/resource/SelectiveReloadStateHandler.java index b870e9da..f4c0503a 100644 --- a/patchwork-resource/src/main/java/net/minecraftforge/resource/SelectiveReloadStateHandler.java +++ b/patchwork-resource/src/main/java/net/minecraftforge/resource/SelectiveReloadStateHandler.java @@ -21,7 +21,7 @@ import java.util.function.Predicate; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.resource.SynchronousResourceReloadListener; //import net.minecraftforge.common.ForgeConfig; diff --git a/patchwork-resource/src/main/java/net/patchworkmc/impl/resource/TypedResourceLoader.java b/patchwork-resource/src/main/java/net/patchworkmc/impl/resource/TypedResourceLoader.java index cd15b696..c4217d5d 100644 --- a/patchwork-resource/src/main/java/net/patchworkmc/impl/resource/TypedResourceLoader.java +++ b/patchwork-resource/src/main/java/net/patchworkmc/impl/resource/TypedResourceLoader.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraftforge.resource.IResourceType; import net.minecraftforge.resource.ReloadRequirements;