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

prevent wildcard imports

Browse source
This commit is contained in:
rlnt 2024-08-26 20:07:58 +02:00
parent 6972e7ff58
commit 30b6af18cf
No known key found for this signature in database
20 changed files with 134 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.editorconfig
View file

@ -71,7 +71,7 @@ ij_java_case_statement_on_separate_line = true
ij_java_catch_on_new_line = false
ij_java_class_annotation_wrap = split_into_lines
ij_java_class_brace_style = end_of_line
ij_java_class_count_to_use_import_on_demand = 5
ij_java_class_count_to_use_import_on_demand = 9999
ij_java_class_names_in_javadoc = 1
ij_java_do_not_indent_top_level_class_members = false
ij_java_do_not_wrap_after_single_annotation = false
@ -140,7 +140,7 @@ ij_java_method_parameters_wrap = off
ij_java_modifier_list_wrap = false
ij_java_names_count_to_use_import_on_demand = 3
ij_java_new_line_after_lparen_in_record_header = false
ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
ij_java_packages_to_use_import_on_demand =
ij_java_parameter_annotation_wrap = off
ij_java_parentheses_expression_new_line_after_left_paren = false
ij_java_parentheses_expression_right_paren_on_new_line = false

6
Common/src/main/java/com/almostreliable/unified/config/DuplicateConfig.java
View file

@ -6,7 +6,11 @@ import com.almostreliable.unified.utils.JsonCompare;
import com.google.gson.JsonObject;
import net.minecraft.resources.ResourceLocation;
import java.util.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

6
Common/src/main/java/com/almostreliable/unified/config/PlaceholderConfig.java
View file

@ -7,7 +7,11 @@ import com.google.common.collect.ImmutableSet;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;

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

@ -18,7 +18,13 @@ import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

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

@ -2,7 +2,11 @@ package com.almostreliable.unified.core;
import com.almostreliable.unified.AlmostUnifiedCommon;
import com.almostreliable.unified.api.AlmostUnifiedRuntime;
import com.almostreliable.unified.api.unification.*;
import com.almostreliable.unified.api.unification.Placeholders;
import com.almostreliable.unified.api.unification.TagSubstitutions;
import com.almostreliable.unified.api.unification.UnificationEntry;
import com.almostreliable.unified.api.unification.UnificationLookup;
import com.almostreliable.unified.api.unification.UnificationSettings;
import com.almostreliable.unified.api.unification.recipe.RecipeUnifierRegistry;
import com.almostreliable.unified.compat.PluginManager;
import com.almostreliable.unified.compat.viewer.ItemHider;
@ -27,7 +31,13 @@ import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;

8
Common/src/main/java/com/almostreliable/unified/unification/StoneVariantsImpl.java
View file

@ -9,7 +9,13 @@ import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import java.util.*;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
public final class StoneVariantsImpl implements StoneVariants {

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

@ -18,7 +18,11 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
public class TagInheritance {

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

@ -13,7 +13,11 @@ import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;

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

@ -1,6 +1,10 @@
package com.almostreliable.unified.unification;
import com.almostreliable.unified.api.unification.*;
import com.almostreliable.unified.api.unification.ModPriorities;
import com.almostreliable.unified.api.unification.StoneVariants;
import com.almostreliable.unified.api.unification.TagSubstitutions;
import com.almostreliable.unified.api.unification.UnificationEntry;
import com.almostreliable.unified.api.unification.UnificationLookup;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import net.minecraft.core.registries.BuiltInRegistries;
@ -11,7 +15,13 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
public final class UnificationLookupImpl implements UnificationLookup {

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

@ -1,6 +1,11 @@
package com.almostreliable.unified.unification;
import com.almostreliable.unified.api.unification.*;
import com.almostreliable.unified.api.unification.ModPriorities;
import com.almostreliable.unified.api.unification.StoneVariants;
import com.almostreliable.unified.api.unification.TagSubstitutions;
import com.almostreliable.unified.api.unification.UnificationEntry;
import com.almostreliable.unified.api.unification.UnificationLookup;
import com.almostreliable.unified.api.unification.UnificationSettings;
import com.almostreliable.unified.config.UnificationConfig;
import com.almostreliable.unified.utils.VanillaTagWrapper;
import net.minecraft.resources.ResourceLocation;

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

@ -20,7 +20,14 @@ import com.google.gson.JsonObject;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;

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

@ -6,7 +6,15 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
public final class JsonCompare {

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

@ -1,6 +1,10 @@
package com.almostreliable.unified.utils;
import com.google.gson.*;
import com.google.gson.Gson;
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 java.io.BufferedReader;

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

@ -8,7 +8,13 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Base wrapper to store vanilla tags and their holders. The wrapper allows to add new tags and holders to a tag.

9
Common/src/test/java/testmod/CommonTest.java
View file

@ -1,7 +1,14 @@
package testmod;
import testmod.gametest_core.GameTestLoader;
import testmod.tests.*;
import testmod.tests.ExampleTest;
import testmod.tests.GregTechModernRecipeUnifierTests;
import testmod.tests.LootUnificationTests;
import testmod.tests.ReplacementsTests;
import testmod.tests.ShapedRecipeUnifierTests;
import testmod.tests.SmithingRecipeUnifierTest;
import testmod.tests.UnificationHandlerTests;
import testmod.tests.UnifyTests;
import testmod.tests.core.TagInheritanceTests;
import testmod.tests.core.TagSubstitutionTests;

6
Common/src/test/java/testmod/TestUtils.java
View file

@ -23,7 +23,11 @@ import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Type;
import java.util.*;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.*;

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

@ -1,6 +1,10 @@
package testmod.gametest_core;
import net.minecraft.gametest.framework.*;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestAssertException;
import net.minecraft.gametest.framework.GameTestHelper;
import net.minecraft.gametest.framework.StructureUtils;
import net.minecraft.gametest.framework.TestFunction;
import net.minecraft.world.level.block.Rotation;
import org.jetbrains.annotations.Nullable;
import testmod.gametest_core.mixin.GameTestHelperAccessor;

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

@ -23,7 +23,11 @@ import net.neoforged.neoforge.registries.RegisterEvent;
import org.jetbrains.annotations.Nullable;
import org.objectweb.asm.Type;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@Mod(ModConstants.ALMOST_UNIFIED)
public class AlmostUnifiedNeoForge {

11
NeoForge/src/main/java/com/almostreliable/unified/core/NeoForgePlugin.java
View file

@ -5,7 +5,16 @@ import com.almostreliable.unified.api.plugin.AlmostUnifiedNeoPlugin;
import com.almostreliable.unified.api.plugin.AlmostUnifiedPlugin;
import com.almostreliable.unified.api.unification.bundled.ShapedRecipeUnifier;
import com.almostreliable.unified.api.unification.recipe.RecipeUnifierRegistry;
import com.almostreliable.unified.compat.unification.*;
import com.almostreliable.unified.compat.unification.ArsNouveauRecipeUnifier;
import com.almostreliable.unified.compat.unification.CyclicRecipeUnifier;
import com.almostreliable.unified.compat.unification.EnderIORecipeUnifier;
import com.almostreliable.unified.compat.unification.ImmersiveEngineeringRecipeUnifier;
import com.almostreliable.unified.compat.unification.IntegratedDynamicsRecipeUnifier;
import com.almostreliable.unified.compat.unification.MekanismRecipeUnifier;
import com.almostreliable.unified.compat.unification.ModernIndustrializationRecipeUnifier;
import com.almostreliable.unified.compat.unification.OccultismRecipeUnifier;
import com.almostreliable.unified.compat.unification.ProductiveTreesRecipeUnifier;
import com.almostreliable.unified.compat.unification.TheurgyRecipeUnifier;
import com.almostreliable.unified.utils.Utils;
import net.minecraft.resources.ResourceLocation;

7
NeoForge/src/test/java/testmod/neoforge/NeoForgeTest.java
View file

@ -12,7 +12,12 @@ import net.neoforged.neoforge.registries.RegisterEvent;
import testmod.CommonTest;
import testmod.TestItems;
import testmod.gametest_core.GameTestLoader;
import testmod.neoforge.tests.*;
import testmod.neoforge.tests.ArsNouveauRecipeTests;
import testmod.neoforge.tests.EnderIORecipeUnifierTests;
import testmod.neoforge.tests.ImmersiveEngineeringRecipeUnifierTests;
import testmod.neoforge.tests.IntegratedDynamicsRecipeUnifierTests;
import testmod.neoforge.tests.MekanismRecipeUnifierTests;
import testmod.neoforge.tests.ModernIndustrializationRecipeUnifierTests;
@Mod("testmod")
public class NeoForgeTest {