removed wildcard imports, also optomized imports

GregTech-Intergalactical · Jan 6, 2025 · 09bf0b6 · 09bf0b6
1 parent 624fab1
commit 09bf0b6
Show file tree

Hide file tree

Showing 204 changed files with 759 additions and 579 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/Antimatter.java b/common/src/main/java/muramasa/antimatter/Antimatter.java
@@ -10,7 +10,14 @@
 import muramasa.antimatter.datagen.AntimatterDynamics;
 import muramasa.antimatter.datagen.loaders.MaterialRecipes;
 import muramasa.antimatter.datagen.loaders.StoneRecipes;
-import muramasa.antimatter.datagen.providers.*;
+import muramasa.antimatter.datagen.providers.AntimatterBlockLootProvider;
+import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
+import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider;
+import muramasa.antimatter.datagen.providers.AntimatterFluidTagProvider;
+import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider;
+import muramasa.antimatter.datagen.providers.AntimatterItemTagProvider;
+import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider;
+import muramasa.antimatter.datagen.providers.AntimatterTagProvider;
 import muramasa.antimatter.event.CraftingEvent;
 import muramasa.antimatter.event.ProvidersEvent;
 import muramasa.antimatter.fluid.AntimatterFluid;
@@ -20,7 +27,12 @@
 import muramasa.antimatter.integration.kubejs.KubeJSRegistrar;
 import muramasa.antimatter.item.interaction.CauldronInteractions;
 import muramasa.antimatter.machine.MachineState;
-import muramasa.antimatter.material.*;
+import muramasa.antimatter.material.Material;
+import muramasa.antimatter.material.MaterialTags;
+import muramasa.antimatter.material.MaterialType;
+import muramasa.antimatter.material.MaterialTypeBlock;
+import muramasa.antimatter.material.MaterialTypeItem;
+import muramasa.antimatter.material.SubTag;
 import muramasa.antimatter.network.AntimatterNetwork;
 import muramasa.antimatter.ore.BlockOre;
 import muramasa.antimatter.ore.StoneType;
@@ -53,8 +65,6 @@
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;

diff --git a/common/src/main/java/muramasa/antimatter/AntimatterAPI.java b/common/src/main/java/muramasa/antimatter/AntimatterAPI.java
@@ -3,7 +3,13 @@
 import com.mojang.datafixers.util.Either;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.*;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import it.unimi.dsi.fastutil.objects.ObjectList;
+import muramasa.antimatter.blockentity.BlockEntityMachine;
 import muramasa.antimatter.blockentity.pipe.BlockEntityPipe;
 import muramasa.antimatter.datagen.IAntimatterProvider;
 import muramasa.antimatter.gui.GuiData;
@@ -14,8 +20,12 @@
 import muramasa.antimatter.material.MaterialType;
 import muramasa.antimatter.ore.StoneType;
 import muramasa.antimatter.recipe.map.IRecipeMap;
-import muramasa.antimatter.registration.*;
-import muramasa.antimatter.blockentity.BlockEntityMachine;
+import muramasa.antimatter.registration.IAntimatterObject;
+import muramasa.antimatter.registration.IAntimatterRegistrar;
+import muramasa.antimatter.registration.IRegistryEntryProvider;
+import muramasa.antimatter.registration.ISharedAntimatterObject;
+import muramasa.antimatter.registration.RegistrationEvent;
+import muramasa.antimatter.registration.Side;
 import muramasa.antimatter.util.AntimatterPlatformUtils;
 import muramasa.antimatter.util.AntimatterPreLaunchUtil;
 import muramasa.antimatter.util.NonNullSupplier;
@@ -33,7 +43,14 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;

diff --git a/common/src/main/java/muramasa/antimatter/AntimatterConfig.java b/common/src/main/java/muramasa/antimatter/AntimatterConfig.java
@@ -1,12 +1,14 @@
 package muramasa.antimatter;
 
 import carbonconfiglib.api.ConfigType;
-import carbonconfiglib.config.*;
+import carbonconfiglib.config.Config;
+import carbonconfiglib.config.ConfigEntry;
+import carbonconfiglib.config.ConfigHandler;
+import carbonconfiglib.config.ConfigSection;
+import carbonconfiglib.config.ConfigSettings;
 import carbonconfiglib.impl.ReloadMode;
 import carbonconfiglib.utils.AutomationType;
 import muramasa.antimatter.util.AntimatterPlatformUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import tesseract.Tesseract;
 
 public class AntimatterConfig {
 

diff --git a/common/src/main/java/muramasa/antimatter/AntimatterProperties.java b/common/src/main/java/muramasa/antimatter/AntimatterProperties.java
@@ -1,12 +1,12 @@
 package muramasa.antimatter;
 
+import muramasa.antimatter.blockentity.BlockEntityMachine.DynamicKey;
 import muramasa.antimatter.client.dynamic.DynamicTexturer;
 import muramasa.antimatter.cover.ICover;
 import muramasa.antimatter.machine.MachineState;
 import muramasa.antimatter.machine.Tier;
 import muramasa.antimatter.machine.types.Machine;
 import muramasa.antimatter.texture.Texture;
-import muramasa.antimatter.blockentity.BlockEntityMachine.DynamicKey;
 import net.minecraft.core.Direction;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/common/src/main/java/muramasa/antimatter/AntimatterRemapping.java b/common/src/main/java/muramasa/antimatter/AntimatterRemapping.java
@@ -2,7 +2,6 @@
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import muramasa.antimatter.machine.types.Machine;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.ArrayList;

diff --git a/common/src/main/java/muramasa/antimatter/Data.java b/common/src/main/java/muramasa/antimatter/Data.java
@@ -1,8 +1,18 @@
 package muramasa.antimatter;
 
 import muramasa.antimatter.blockentity.BlockEntityMachine;
+import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
+import muramasa.antimatter.blockentity.single.BlockEntityInfiniteStorage;
 import muramasa.antimatter.capability.IGuiHandler;
-import muramasa.antimatter.cover.*;
+import muramasa.antimatter.cover.CoverDebug;
+import muramasa.antimatter.cover.CoverDynamo;
+import muramasa.antimatter.cover.CoverEnergy;
+import muramasa.antimatter.cover.CoverFactory;
+import muramasa.antimatter.cover.CoverHeat;
+import muramasa.antimatter.cover.CoverInput;
+import muramasa.antimatter.cover.CoverMuffler;
+import muramasa.antimatter.cover.CoverOutput;
+import muramasa.antimatter.cover.ICover;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.gui.MenuHandlerCover;
 import muramasa.antimatter.gui.MenuHandlerMachine;
@@ -11,14 +21,12 @@
 import muramasa.antimatter.gui.container.ContainerCover;
 import muramasa.antimatter.gui.container.ContainerMachine;
 import muramasa.antimatter.gui.container.ContainerMultiMachine;
-import muramasa.antimatter.item.ScannerItem;
 import muramasa.antimatter.item.ItemCover;
 import muramasa.antimatter.item.ItemFluidIcon;
+import muramasa.antimatter.item.ScannerItem;
 import muramasa.antimatter.machine.types.BasicMachine;
 import muramasa.antimatter.registration.Side;
 import muramasa.antimatter.texture.Texture;
-import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
-import muramasa.antimatter.blockentity.single.BlockEntityInfiniteStorage;
 import muramasa.antimatter.tool.enchantment.ElectricEnchantment;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.entity.EquipmentSlot;

diff --git a/common/src/main/java/muramasa/antimatter/MaterialDataInit.java b/common/src/main/java/muramasa/antimatter/MaterialDataInit.java
@@ -5,14 +5,12 @@
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.event.MaterialEvent;
 import muramasa.antimatter.material.MaterialTags;
-import muramasa.antimatter.tool.AntimatterToolType;
 import net.minecraft.world.item.enchantment.Enchantments;
 
 import java.util.List;
 
 import static com.google.common.collect.ImmutableMap.of;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
-import static muramasa.antimatter.data.AntimatterMaterialTypes.PICKAXE_HEAD;
 import static muramasa.antimatter.material.MaterialTags.MOLTEN;
 import static muramasa.antimatter.material.MaterialTags.QUARTZ_LIKE_BLOCKS;
 import static net.minecraft.world.item.Tiers.*;

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockBasicSlab.java b/common/src/main/java/muramasa/antimatter/block/BlockBasicSlab.java
@@ -2,7 +2,6 @@
 
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
-import muramasa.antimatter.data.AntimatterStoneTypes;
 import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
 import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder;
 import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockBasicStair.java b/common/src/main/java/muramasa/antimatter/block/BlockBasicStair.java
@@ -12,13 +12,10 @@
 import muramasa.antimatter.registration.ITextureProvider;
 import muramasa.antimatter.texture.Texture;
 import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.block.state.properties.Half;
-import net.minecraft.world.level.block.state.properties.SlabType;
 import net.minecraft.world.level.block.state.properties.StairsShape;
 import net.minecraft.world.level.material.Material;
 

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockFrame.java b/common/src/main/java/muramasa/antimatter/block/BlockFrame.java
@@ -4,7 +4,6 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.material.Material;
-import muramasa.antimatter.material.MaterialTags;
 import muramasa.antimatter.material.MaterialType;
 import muramasa.antimatter.registration.IItemBlockProvider;
 import muramasa.antimatter.util.Utils;
@@ -26,14 +25,10 @@
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.ScaffoldingBlock;
 import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.levelgen.RandomSource;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.PushReaction;
@@ -42,11 +37,9 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Iterator;
 import java.util.Random;
 
 import static muramasa.antimatter.material.MaterialTags.*;
-import static net.minecraft.world.level.block.state.properties.BlockStateProperties.BOTTOM;
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
 public class BlockFrame extends BlockStorage implements IItemBlockProvider, SimpleWaterloggedBlock {

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockStoneSlab.java b/common/src/main/java/muramasa/antimatter/block/BlockStoneSlab.java
@@ -1,20 +1,16 @@
 package muramasa.antimatter.block;
 
 import lombok.Getter;
-import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterStoneTypes;
 import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
 import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder.VariantBuilder;
 import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
 import muramasa.antimatter.ore.CobbleStoneType;
 import muramasa.antimatter.ore.StoneType;
-import muramasa.antimatter.registration.IModelProvider;
 import muramasa.antimatter.registration.ISharedAntimatterObject;
-import muramasa.antimatter.registration.ITextureProvider;
 import muramasa.antimatter.texture.Texture;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.state.properties.SlabType;
 
 public class BlockStoneSlab extends BlockBasicSlab implements ISharedAntimatterObject {

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockStorage.java b/common/src/main/java/muramasa/antimatter/block/BlockStorage.java
@@ -3,39 +3,9 @@
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.material.Material;
-import muramasa.antimatter.material.MaterialTags;
 import muramasa.antimatter.material.MaterialType;
-import muramasa.antimatter.registration.IItemBlockProvider;
 import muramasa.antimatter.registration.ISharedAntimatterObject;
-import muramasa.antimatter.util.Utils;
-import net.minecraft.ChatFormatting;
-import net.minecraft.Util;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.chat.ChatType;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ScaffoldingBlockItem;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.ScaffoldingBlock;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.PushReaction;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 
 public class BlockStorage extends BlockMaterialType implements ISharedAntimatterObject {
 

diff --git a/common/src/main/java/muramasa/antimatter/block/BlockSurfaceRock.java b/common/src/main/java/muramasa/antimatter/block/BlockSurfaceRock.java
@@ -4,8 +4,6 @@
 import lombok.Getter;
 import muramasa.antimatter.AntimatterConfig;
 import muramasa.antimatter.Ref;
-import muramasa.antimatter.data.AntimatterMaterialTypes;
-import muramasa.antimatter.data.AntimatterStoneTypes;
 import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
 import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
 import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider;

diff --git a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityBase.java b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityBase.java
@@ -2,7 +2,6 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import muramasa.antimatter.Antimatter;
 import muramasa.antimatter.capability.Dispatch;
@@ -17,7 +16,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.EnumMap;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;

diff --git a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityCache.java b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityCache.java
@@ -1,7 +1,6 @@
 package muramasa.antimatter.blockentity;
 
 import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;

diff --git a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityFakeBlock.java b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityFakeBlock.java
@@ -3,12 +3,12 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.block.BlockFakeTile;
+import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine;
 import muramasa.antimatter.capability.ICoverHandler;
 import muramasa.antimatter.client.dynamic.DynamicTexturer;
 import muramasa.antimatter.client.dynamic.DynamicTexturers;
 import muramasa.antimatter.cover.CoverFactory;
 import muramasa.antimatter.cover.ICover;
-import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine;
 import muramasa.antimatter.network.AntimatterNetwork;
 import muramasa.antimatter.network.packets.FakeTilePacket;
 import muramasa.antimatter.util.Utils;

diff --git a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityMachine.java b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityMachine.java
@@ -8,16 +8,32 @@
 import muramasa.antimatter.AntimatterProperties;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine;
-import muramasa.antimatter.capability.*;
-import muramasa.antimatter.capability.machine.*;
+import muramasa.antimatter.capability.CoverHandler;
+import muramasa.antimatter.capability.EnergyHandler;
+import muramasa.antimatter.capability.Holder;
+import muramasa.antimatter.capability.ICoverHandler;
+import muramasa.antimatter.capability.ICoverHandlerProvider;
+import muramasa.antimatter.capability.IGuiHandler;
+import muramasa.antimatter.capability.IMachineHandler;
+import muramasa.antimatter.capability.machine.DefaultHeatHandler;
+import muramasa.antimatter.capability.machine.MachineCoverHandler;
+import muramasa.antimatter.capability.machine.MachineEnergyHandler;
+import muramasa.antimatter.capability.machine.MachineFluidHandler;
+import muramasa.antimatter.capability.machine.MachineItemHandler;
+import muramasa.antimatter.capability.machine.MachineRFHandler;
+import muramasa.antimatter.capability.machine.MachineRecipeHandler;
 import muramasa.antimatter.client.SoundHelper;
 import muramasa.antimatter.client.dynamic.DynamicTexturer;
 import muramasa.antimatter.client.dynamic.DynamicTexturers;
 import muramasa.antimatter.client.tesr.Caches;
 import muramasa.antimatter.client.tesr.MachineTESR;
 import muramasa.antimatter.cover.CoverFactory;
 import muramasa.antimatter.cover.ICover;
-import muramasa.antimatter.gui.*;
+import muramasa.antimatter.gui.GuiData;
+import muramasa.antimatter.gui.GuiInstance;
+import muramasa.antimatter.gui.IGuiElement;
+import muramasa.antimatter.gui.SlotData;
+import muramasa.antimatter.gui.SlotType;
 import muramasa.antimatter.gui.container.ContainerMachine;
 import muramasa.antimatter.gui.event.IGuiEvent;
 import muramasa.antimatter.gui.event.SlotClickEvent;

diff --git a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityStorage.java b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityStorage.java
@@ -4,7 +4,6 @@
 import muramasa.antimatter.capability.machine.MachineEnergyHandler;
 import muramasa.antimatter.machine.event.IMachineEvent;
 import muramasa.antimatter.machine.types.Machine;
-import muramasa.antimatter.util.Utils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;