amy/almostunified
1
0
Fork 0
mirror of https://github.com/AlmostReliable/almostunified.git synced 2024-11-30 11:27:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch to jetbrains nullable annotation

Browse source
This commit is contained in:
rlnt 2024-08-26 19:57:00 +02:00
parent 82b50fdc89
commit 9a7a80f29d
No known key found for this signature in database
35 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common/src/main/java/com/almostreliable/unified/AlmostUnifiedCommon.java
View file

@ -14,8 +14,8 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Map;
@SuppressWarnings({ "UtilityClassWithoutPrivateConstructor", "StaticVariableUsedBeforeInitialization" })

2
Common/src/main/java/com/almostreliable/unified/api/AlmostUnified.java
View file

@ -4,8 +4,8 @@ import com.almostreliable.unified.api.unification.Placeholders;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.ItemLike;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.ServiceLoader;
import java.util.Set;

2
Common/src/main/java/com/almostreliable/unified/api/AlmostUnifiedRuntime.java
View file

@ -4,8 +4,8 @@ import com.almostreliable.unified.api.unification.Placeholders;
import com.almostreliable.unified.api.unification.TagSubstitutions;
import com.almostreliable.unified.api.unification.UnificationLookup;
import com.almostreliable.unified.api.unification.UnificationSettings;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
/**

2
Common/src/main/java/com/almostreliable/unified/api/unification/ModPriorities.java
View file

@ -2,8 +2,8 @@ package com.almostreliable.unified.api.unification;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.List;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

2
Common/src/main/java/com/almostreliable/unified/api/unification/TagSubstitutions.java
View file

@ -2,8 +2,8 @@ package com.almostreliable.unified.api.unification;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Set;

2
Common/src/main/java/com/almostreliable/unified/api/unification/UnificationLookup.java
View file

@ -7,8 +7,8 @@ import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.function.Predicate;

3
Common/src/main/java/com/almostreliable/unified/api/unification/recipe/RecipeJson.java
View file

@ -1,8 +1,7 @@
package com.almostreliable.unified.api.unification.recipe;
import com.google.gson.JsonElement;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
/**
* Abstraction of a recipe JSON to access and override properties.

3
Common/src/main/java/com/almostreliable/unified/api/unification/recipe/UnificationHelper.java
View file

@ -8,8 +8,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
/**
* Helper interface to aid in the unification of recipes.

2
Common/src/main/java/com/almostreliable/unified/compat/PluginManager.java
View file

@ -5,8 +5,8 @@ import com.almostreliable.unified.api.constant.ModConstants;
import com.almostreliable.unified.api.plugin.AlmostUnifiedPlugin;
import com.almostreliable.unified.api.unification.recipe.RecipeUnifierRegistry;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

2
Common/src/main/java/com/almostreliable/unified/compat/kube/AlmostKube.java
View file

@ -8,8 +8,8 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Set;
import java.util.stream.Collectors;

2
Common/src/main/java/com/almostreliable/unified/compat/viewer/AlmostJEI.java
View file

@ -18,8 +18,8 @@ import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;

2
Common/src/main/java/com/almostreliable/unified/compat/viewer/AlmostREI.java
View file

@ -23,8 +23,8 @@ import net.minecraft.core.Holder;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

3
Common/src/main/java/com/almostreliable/unified/compat/viewer/CRTLookup.java
View file

@ -4,8 +4,7 @@ import com.almostreliable.unified.utils.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.RecipeHolder;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public final class CRTLookup {

2
Common/src/main/java/com/almostreliable/unified/compat/viewer/ClientRecipeTracker.java
View file

@ -18,8 +18,8 @@ import net.minecraft.world.item.crafting.RecipeInput;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

2
Common/src/main/java/com/almostreliable/unified/config/UnificationConfig.java
View file

@ -13,8 +13,8 @@ import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

2
Common/src/main/java/com/almostreliable/unified/core/AlmostUnifiedImpl.java
View file

@ -10,8 +10,8 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.ItemLike;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;

2
Common/src/main/java/com/almostreliable/unified/core/AlmostUnifiedRuntimeImpl.java
View file

@ -25,8 +25,8 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;

2
Common/src/main/java/com/almostreliable/unified/core/TagReloadHandler.java
View file

@ -11,8 +11,8 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Map;
import java.util.Set;

2
Common/src/main/java/com/almostreliable/unified/unification/ModPrioritiesImpl.java
View file

@ -5,8 +5,8 @@ import com.almostreliable.unified.api.unification.ModPriorities;
import com.almostreliable.unified.api.unification.UnificationEntry;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

2
Common/src/main/java/com/almostreliable/unified/unification/TagInheritance.java
View file

@ -16,8 +16,8 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
import java.util.regex.Pattern;

2
Common/src/main/java/com/almostreliable/unified/unification/TagSubstitutionsImpl.java
View file

@ -11,8 +11,8 @@ import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;

2
Common/src/main/java/com/almostreliable/unified/unification/UnificationEntryImpl.java
View file

@ -6,8 +6,8 @@ import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Objects;
public class UnificationEntryImpl<T> implements UnificationEntry<T> {

2
Common/src/main/java/com/almostreliable/unified/unification/UnificationLookupImpl.java
View file

@ -9,8 +9,8 @@ import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Predicate;

2
Common/src/main/java/com/almostreliable/unified/unification/UnificationSettingsImpl.java
View file

@ -9,8 +9,8 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;

2
Common/src/main/java/com/almostreliable/unified/unification/recipe/RecipeLink.java
View file

@ -5,8 +5,8 @@ import com.almostreliable.unified.utils.JsonCompare;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

2
Common/src/main/java/com/almostreliable/unified/unification/recipe/RecipeTransformer.java
View file

@ -18,8 +18,8 @@ import com.google.common.collect.Multimap;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Consumer;
import java.util.stream.Collectors;

3
Common/src/main/java/com/almostreliable/unified/unification/recipe/UnificationHelperImpl.java
View file

@ -13,8 +13,7 @@ import com.google.gson.JsonPrimitive;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public record UnificationHelperImpl(UnificationLookup getUnificationLookup) implements UnificationHelper {

2
Common/src/main/java/com/almostreliable/unified/utils/JsonCompare.java
View file

@ -4,8 +4,8 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
public final class JsonCompare {

2
Common/src/main/java/com/almostreliable/unified/utils/JsonQuery.java
View file

@ -5,8 +5,8 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Optional;
public class JsonQuery {

2
Common/src/main/java/com/almostreliable/unified/utils/JsonUtils.java
View file

@ -1,8 +1,8 @@
package com.almostreliable.unified.utils;
import com.google.gson.*;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.io.BufferedReader;
import java.io.IOException;
import java.nio.file.Files;

2
Common/src/main/java/com/almostreliable/unified/utils/VanillaTagWrapper.java
View file

@ -6,8 +6,8 @@ import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.*;
/**

2
Common/src/test/java/testmod/gametest_core/GameTestLoader.java
View file

@ -2,10 +2,10 @@ package testmod.gametest_core;
import net.minecraft.gametest.framework.*;
import net.minecraft.world.level.block.Rotation;
import org.jetbrains.annotations.Nullable;
import testmod.gametest_core.mixin.GameTestHelperAccessor;
import testmod.gametest_core.mixin.GameTestRegistryAccessor;
import javax.annotation.Nullable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;

1
Common/src/test/java/testmod/old/utils/ReplacementMapTests.java
View file

@ -1,7 +1,6 @@
package testmod.old.utils;
// TODO I BROKE THEM! NEED TO FIX
public class ReplacementMapTests {

2
NeoForge/src/main/java/com/almostreliable/unified/AlmostUnifiedNeoForge.java
View file

@ -20,9 +20,9 @@ import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.registries.NeoForgeRegistries;
import net.neoforged.neoforge.registries.RegisterEvent;
import org.jetbrains.annotations.Nullable;
import org.objectweb.asm.Type;
import javax.annotation.Nullable;
import java.util.*;
@Mod(ModConstants.ALMOST_UNIFIED)

2
NeoForge/src/main/java/com/almostreliable/unified/unification/worldgen/WorldGenBiomeModifier.java
View file

@ -12,8 +12,8 @@ import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.neoforged.neoforge.common.world.BiomeModifier;
import net.neoforged.neoforge.common.world.ModifiableBiomeInfo;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;