Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 09bf0b6

Browse files
committed
removed wildcard imports, also optomized imports
1 parent 624fab1 commit 09bf0b6

File tree

204 files changed

+759
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+759
-579
lines changed

common/src/main/java/muramasa/antimatter/Antimatter.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
import muramasa.antimatter.datagen.AntimatterDynamics;
1111
import muramasa.antimatter.datagen.loaders.MaterialRecipes;
1212
import muramasa.antimatter.datagen.loaders.StoneRecipes;
13-
import muramasa.antimatter.datagen.providers.*;
13+
import muramasa.antimatter.datagen.providers.AntimatterBlockLootProvider;
14+
import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
15+
import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider;
16+
import muramasa.antimatter.datagen.providers.AntimatterFluidTagProvider;
17+
import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider;
18+
import muramasa.antimatter.datagen.providers.AntimatterItemTagProvider;
19+
import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider;
20+
import muramasa.antimatter.datagen.providers.AntimatterTagProvider;
1421
import muramasa.antimatter.event.CraftingEvent;
1522
import muramasa.antimatter.event.ProvidersEvent;
1623
import muramasa.antimatter.fluid.AntimatterFluid;
@@ -20,7 +27,12 @@
2027
import muramasa.antimatter.integration.kubejs.KubeJSRegistrar;
2128
import muramasa.antimatter.item.interaction.CauldronInteractions;
2229
import muramasa.antimatter.machine.MachineState;
23-
import muramasa.antimatter.material.*;
30+
import muramasa.antimatter.material.Material;
31+
import muramasa.antimatter.material.MaterialTags;
32+
import muramasa.antimatter.material.MaterialType;
33+
import muramasa.antimatter.material.MaterialTypeBlock;
34+
import muramasa.antimatter.material.MaterialTypeItem;
35+
import muramasa.antimatter.material.SubTag;
2436
import muramasa.antimatter.network.AntimatterNetwork;
2537
import muramasa.antimatter.ore.BlockOre;
2638
import muramasa.antimatter.ore.StoneType;
@@ -53,8 +65,6 @@
5365

5466
import javax.imageio.ImageIO;
5567
import java.awt.image.BufferedImage;
56-
import java.io.File;
57-
import java.io.FileOutputStream;
5868
import java.io.IOException;
5969
import java.io.InputStream;
6070
import java.util.List;

common/src/main/java/muramasa/antimatter/AntimatterAPI.java

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
import com.mojang.datafixers.util.Either;
44
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
55
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
6-
import it.unimi.dsi.fastutil.objects.*;
6+
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
7+
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
8+
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
9+
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
10+
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
11+
import it.unimi.dsi.fastutil.objects.ObjectList;
12+
import muramasa.antimatter.blockentity.BlockEntityMachine;
713
import muramasa.antimatter.blockentity.pipe.BlockEntityPipe;
814
import muramasa.antimatter.datagen.IAntimatterProvider;
915
import muramasa.antimatter.gui.GuiData;
@@ -14,8 +20,12 @@
1420
import muramasa.antimatter.material.MaterialType;
1521
import muramasa.antimatter.ore.StoneType;
1622
import muramasa.antimatter.recipe.map.IRecipeMap;
17-
import muramasa.antimatter.registration.*;
18-
import muramasa.antimatter.blockentity.BlockEntityMachine;
23+
import muramasa.antimatter.registration.IAntimatterObject;
24+
import muramasa.antimatter.registration.IAntimatterRegistrar;
25+
import muramasa.antimatter.registration.IRegistryEntryProvider;
26+
import muramasa.antimatter.registration.ISharedAntimatterObject;
27+
import muramasa.antimatter.registration.RegistrationEvent;
28+
import muramasa.antimatter.registration.Side;
1929
import muramasa.antimatter.util.AntimatterPlatformUtils;
2030
import muramasa.antimatter.util.AntimatterPreLaunchUtil;
2131
import muramasa.antimatter.util.NonNullSupplier;
@@ -33,7 +43,14 @@
3343
import org.jetbrains.annotations.NotNull;
3444
import org.jetbrains.annotations.Nullable;
3545

36-
import java.util.*;
46+
import java.util.Arrays;
47+
import java.util.Deque;
48+
import java.util.EnumMap;
49+
import java.util.EnumSet;
50+
import java.util.LinkedList;
51+
import java.util.List;
52+
import java.util.Map;
53+
import java.util.Optional;
3754
import java.util.function.Consumer;
3855
import java.util.function.Supplier;
3956
import java.util.stream.Collectors;

common/src/main/java/muramasa/antimatter/AntimatterConfig.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package muramasa.antimatter;
22

33
import carbonconfiglib.api.ConfigType;
4-
import carbonconfiglib.config.*;
4+
import carbonconfiglib.config.Config;
5+
import carbonconfiglib.config.ConfigEntry;
6+
import carbonconfiglib.config.ConfigHandler;
7+
import carbonconfiglib.config.ConfigSection;
8+
import carbonconfiglib.config.ConfigSettings;
59
import carbonconfiglib.impl.ReloadMode;
610
import carbonconfiglib.utils.AutomationType;
711
import muramasa.antimatter.util.AntimatterPlatformUtils;
8-
import org.apache.commons.lang3.tuple.Pair;
9-
import tesseract.Tesseract;
1012

1113
public class AntimatterConfig {
1214

common/src/main/java/muramasa/antimatter/AntimatterProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package muramasa.antimatter;
22

3+
import muramasa.antimatter.blockentity.BlockEntityMachine.DynamicKey;
34
import muramasa.antimatter.client.dynamic.DynamicTexturer;
45
import muramasa.antimatter.cover.ICover;
56
import muramasa.antimatter.machine.MachineState;
67
import muramasa.antimatter.machine.Tier;
78
import muramasa.antimatter.machine.types.Machine;
89
import muramasa.antimatter.texture.Texture;
9-
import muramasa.antimatter.blockentity.BlockEntityMachine.DynamicKey;
1010
import net.minecraft.core.Direction;
1111
import org.jetbrains.annotations.Nullable;
1212

common/src/main/java/muramasa/antimatter/AntimatterRemapping.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
44
import muramasa.antimatter.machine.types.Machine;
5-
import net.minecraft.core.Registry;
65
import net.minecraft.resources.ResourceLocation;
76

87
import java.util.ArrayList;

common/src/main/java/muramasa/antimatter/Data.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
package muramasa.antimatter;
22

33
import muramasa.antimatter.blockentity.BlockEntityMachine;
4+
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
5+
import muramasa.antimatter.blockentity.single.BlockEntityInfiniteStorage;
46
import muramasa.antimatter.capability.IGuiHandler;
5-
import muramasa.antimatter.cover.*;
7+
import muramasa.antimatter.cover.CoverDebug;
8+
import muramasa.antimatter.cover.CoverDynamo;
9+
import muramasa.antimatter.cover.CoverEnergy;
10+
import muramasa.antimatter.cover.CoverFactory;
11+
import muramasa.antimatter.cover.CoverHeat;
12+
import muramasa.antimatter.cover.CoverInput;
13+
import muramasa.antimatter.cover.CoverMuffler;
14+
import muramasa.antimatter.cover.CoverOutput;
15+
import muramasa.antimatter.cover.ICover;
616
import muramasa.antimatter.data.AntimatterMaterialTypes;
717
import muramasa.antimatter.gui.MenuHandlerCover;
818
import muramasa.antimatter.gui.MenuHandlerMachine;
@@ -11,14 +21,12 @@
1121
import muramasa.antimatter.gui.container.ContainerCover;
1222
import muramasa.antimatter.gui.container.ContainerMachine;
1323
import muramasa.antimatter.gui.container.ContainerMultiMachine;
14-
import muramasa.antimatter.item.ScannerItem;
1524
import muramasa.antimatter.item.ItemCover;
1625
import muramasa.antimatter.item.ItemFluidIcon;
26+
import muramasa.antimatter.item.ScannerItem;
1727
import muramasa.antimatter.machine.types.BasicMachine;
1828
import muramasa.antimatter.registration.Side;
1929
import muramasa.antimatter.texture.Texture;
20-
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
21-
import muramasa.antimatter.blockentity.single.BlockEntityInfiniteStorage;
2230
import muramasa.antimatter.tool.enchantment.ElectricEnchantment;
2331
import net.minecraft.ChatFormatting;
2432
import net.minecraft.world.entity.EquipmentSlot;

common/src/main/java/muramasa/antimatter/MaterialDataInit.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
import muramasa.antimatter.data.AntimatterMaterials;
66
import muramasa.antimatter.event.MaterialEvent;
77
import muramasa.antimatter.material.MaterialTags;
8-
import muramasa.antimatter.tool.AntimatterToolType;
98
import net.minecraft.world.item.enchantment.Enchantments;
109

1110
import java.util.List;
1211

1312
import static com.google.common.collect.ImmutableMap.of;
1413
import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
15-
import static muramasa.antimatter.data.AntimatterMaterialTypes.PICKAXE_HEAD;
1614
import static muramasa.antimatter.material.MaterialTags.MOLTEN;
1715
import static muramasa.antimatter.material.MaterialTags.QUARTZ_LIKE_BLOCKS;
1816
import static net.minecraft.world.item.Tiers.*;

common/src/main/java/muramasa/antimatter/block/BlockBasicSlab.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import muramasa.antimatter.AntimatterAPI;
44
import muramasa.antimatter.Ref;
5-
import muramasa.antimatter.data.AntimatterStoneTypes;
65
import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
76
import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder;
87
import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;

common/src/main/java/muramasa/antimatter/block/BlockBasicStair.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
import muramasa.antimatter.registration.ITextureProvider;
1313
import muramasa.antimatter.texture.Texture;
1414
import net.minecraft.core.Direction;
15-
import net.minecraft.resources.ResourceLocation;
1615
import net.minecraft.world.level.block.Block;
17-
import net.minecraft.world.level.block.SlabBlock;
1816
import net.minecraft.world.level.block.SoundType;
1917
import net.minecraft.world.level.block.StairBlock;
2018
import net.minecraft.world.level.block.state.properties.Half;
21-
import net.minecraft.world.level.block.state.properties.SlabType;
2219
import net.minecraft.world.level.block.state.properties.StairsShape;
2320
import net.minecraft.world.level.material.Material;
2421

common/src/main/java/muramasa/antimatter/block/BlockFrame.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
55
import muramasa.antimatter.data.AntimatterMaterialTypes;
66
import muramasa.antimatter.material.Material;
7-
import muramasa.antimatter.material.MaterialTags;
87
import muramasa.antimatter.material.MaterialType;
98
import muramasa.antimatter.registration.IItemBlockProvider;
109
import muramasa.antimatter.util.Utils;
@@ -26,14 +25,10 @@
2625
import net.minecraft.world.level.LevelAccessor;
2726
import net.minecraft.world.level.LevelReader;
2827
import net.minecraft.world.level.block.Block;
29-
import net.minecraft.world.level.block.Blocks;
30-
import net.minecraft.world.level.block.ScaffoldingBlock;
3128
import net.minecraft.world.level.block.SimpleWaterloggedBlock;
3229
import net.minecraft.world.level.block.state.BlockState;
3330
import net.minecraft.world.level.block.state.StateDefinition;
3431
import net.minecraft.world.level.block.state.properties.IntegerProperty;
35-
import net.minecraft.world.level.block.state.properties.Property;
36-
import net.minecraft.world.level.levelgen.RandomSource;
3732
import net.minecraft.world.level.material.FluidState;
3833
import net.minecraft.world.level.material.Fluids;
3934
import net.minecraft.world.level.material.PushReaction;
@@ -42,11 +37,9 @@
4237
import net.minecraft.world.phys.shapes.VoxelShape;
4338
import org.jetbrains.annotations.Nullable;
4439

45-
import java.util.Iterator;
4640
import java.util.Random;
4741

4842
import static muramasa.antimatter.material.MaterialTags.*;
49-
import static net.minecraft.world.level.block.state.properties.BlockStateProperties.BOTTOM;
5043
import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
5144

5245
public class BlockFrame extends BlockStorage implements IItemBlockProvider, SimpleWaterloggedBlock {

0 commit comments

Comments
 (0)