⚰️ optimize imports and unused fields

src/main/java/com/voxelutopia/ultramarine/Ultramarine.java

@@ -1,6 +1,5 @@
 package com.voxelutopia.ultramarine;
 
-import com.mojang.logging.LogUtils;
 import com.voxelutopia.ultramarine.data.registry.*;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -10,8 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.logging.LogManager;
-
 @Mod(Ultramarine.MOD_ID)
 public class Ultramarine {
 

src/main/java/com/voxelutopia/ultramarine/client/integration/jei/ChiselTableRecipeCategory.java

@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.voxelutopia.ultramarine.Ultramarine;
 import com.voxelutopia.ultramarine.data.recipe.ChiselTableRecipe;
-import com.voxelutopia.ultramarine.data.recipe.CompositeSmeltingRecipe;
 import com.voxelutopia.ultramarine.data.registry.BlockRegistry;
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;

src/main/java/com/voxelutopia/ultramarine/client/integration/jei/UltramarinePlugin.java

@@ -3,7 +3,6 @@
 import com.voxelutopia.ultramarine.Ultramarine;
 import com.voxelutopia.ultramarine.client.screen.BrickKilnScreen;
 import com.voxelutopia.ultramarine.client.screen.ChiselTableScreen;
-import com.voxelutopia.ultramarine.client.screen.WoodworkingWorkbenchScreen;
 import com.voxelutopia.ultramarine.data.recipe.ChiselTableRecipe;
 import com.voxelutopia.ultramarine.data.recipe.CompositeSmeltingRecipe;
 import com.voxelutopia.ultramarine.data.recipe.WoodworkingRecipe;

src/main/java/com/voxelutopia/ultramarine/client/screen/BrickKilnScreen.java

@@ -4,7 +4,6 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.voxelutopia.ultramarine.Ultramarine;
 import com.voxelutopia.ultramarine.world.block.menu.BrickKilnMenu;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;

src/main/java/com/voxelutopia/ultramarine/client/screen/ChiselTableScreen.java

@@ -4,13 +4,11 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.voxelutopia.ultramarine.Ultramarine;
 import com.voxelutopia.ultramarine.world.block.menu.ChiselTableMenu;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.inventory.CraftingMenu;
 
 public class ChiselTableScreen extends AbstractContainerScreen<ChiselTableMenu> {
 

src/main/java/com/voxelutopia/ultramarine/data/recipe/ChiselTableRecipe.java

@@ -18,7 +18,10 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 public class ChiselTableRecipe implements Recipe<Container> {

src/main/java/com/voxelutopia/ultramarine/data/recipe/WoodworkingRecipe.java

@@ -4,18 +4,19 @@
 import com.voxelutopia.ultramarine.Ultramarine;
 import com.voxelutopia.ultramarine.data.registry.RecipeSerializerRegistry;
 import com.voxelutopia.ultramarine.data.registry.RecipeTypeRegistry;
-import net.minecraft.core.NonNullList;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.*;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.item.crafting.SingleItemRecipe;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.registries.ForgeRegistries;
 
 import javax.annotation.Nullable;
-import java.util.List;
 
 public class WoodworkingRecipe extends SingleItemRecipe {
 

src/main/java/com/voxelutopia/ultramarine/data/registry/BlockEntityRegistry.java

@@ -1,7 +1,10 @@
 package com.voxelutopia.ultramarine.data.registry;
 
 import com.voxelutopia.ultramarine.Ultramarine;
-import com.voxelutopia.ultramarine.world.block.entity.*;
+import com.voxelutopia.ultramarine.world.block.entity.BottleGourdBlockEntity;
+import com.voxelutopia.ultramarine.world.block.entity.BrickKilnBlockEntity;
+import com.voxelutopia.ultramarine.world.block.entity.CenserBlockEntity;
+import com.voxelutopia.ultramarine.world.block.entity.ContainerDecorativeBlockEntity;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraftforge.registries.DeferredRegister;

src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java

@@ -3,11 +3,10 @@
 import com.voxelutopia.ultramarine.Ultramarine;
 import com.voxelutopia.ultramarine.data.ContainerType;
 import com.voxelutopia.ultramarine.data.ModFoods;
+import com.voxelutopia.ultramarine.data.shape.BlockShapes;
 import com.voxelutopia.ultramarine.data.shape.RawVoxelShape;
 import com.voxelutopia.ultramarine.data.shape.ShapeFunction;
-import com.voxelutopia.ultramarine.data.shape.BlockShapes;
 import com.voxelutopia.ultramarine.world.block.*;
-import com.voxelutopia.ultramarine.world.block.HangingLantern;
 import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties;
 import net.minecraft.core.Direction;
 import net.minecraft.world.food.Foods;

src/main/java/com/voxelutopia/ultramarine/data/registry/EntityTypeRegistry.java

@@ -1,8 +1,8 @@
 package com.voxelutopia.ultramarine.data.registry;
 
 import com.voxelutopia.ultramarine.Ultramarine;
-import com.voxelutopia.ultramarine.world.entity.TravellingMerchant;
 import com.voxelutopia.ultramarine.world.entity.SeatEntity;
+import com.voxelutopia.ultramarine.world.entity.TravellingMerchant;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;

src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java

@@ -826,7 +826,6 @@ public class ItemRegistry {
      */
 
     public static final RegistryObject<Item> WOODEN_MALLET = ITEMS.register("wooden_mallet", WoodenMallet::new);
-    //public static final RegistryObject<Item> GUIDE_BOOK = simpleItem("guide_book", ModCreativeTab.TOOLS);
     public static final RegistryObject<Item> BLUE_AND_WHITE_PORCELAIN_SWORD = ITEMS.register("blue_and_white_porcelain_sword",
             () -> new SwordItem(ModTiers.BLUE_AND_WHITE_PORCELAIN, 3, -2.4F, new Item.Properties().tab(ModCreativeTab.TOOLS.getTab())));
     public static final RegistryObject<Item> BLUE_AND_WHITE_PORCELAIN_SHOVEL = ITEMS.register("blue_and_white_porcelain_shovel",

src/main/java/com/voxelutopia/ultramarine/data/registry/SoundRegistry.java

@@ -9,8 +9,6 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
-import java.util.function.Supplier;
-
 public class SoundRegistry {
     public static final DeferredRegister<SoundEvent> SOUND_EVENT =
             DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, Ultramarine.MOD_ID);

src/main/java/com/voxelutopia/ultramarine/data/registry/VillagerProfessionRegistry.java

@@ -3,7 +3,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.voxelutopia.ultramarine.Ultramarine;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;

src/main/java/com/voxelutopia/ultramarine/datagen/BaseLootTableProvider.java

@@ -34,7 +34,10 @@
 import net.minecraft.world.level.storage.loot.functions.FunctionUserBuilder;
 import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.predicates.*;
+import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition;
+import net.minecraft.world.level.storage.loot.predicates.MatchTool;
 import net.minecraft.world.level.storage.loot.providers.number.BinomialDistributionGenerator;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;

src/main/java/com/voxelutopia/ultramarine/datagen/MergedTextureProvider.java

@@ -8,17 +8,19 @@
 import net.minecraft.data.HashCache;
 import net.minecraftforge.common.data.ExistingFileHelper;
 import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.system.CallbackI;
 import org.slf4j.Logger;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
-import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 public class MergedTextureProvider implements DataProvider {
 

src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java

@@ -1,9 +1,9 @@
 package com.voxelutopia.ultramarine.datagen;
 
 import com.voxelutopia.ultramarine.data.registry.BlockRegistry;
+import com.voxelutopia.ultramarine.world.block.*;
 import com.voxelutopia.ultramarine.world.block.state.ChiralBlockType;
 import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties;
-import com.voxelutopia.ultramarine.world.block.*;
 import com.voxelutopia.ultramarine.world.block.state.OrientableBlockType;
 import com.voxelutopia.ultramarine.world.block.state.StackableBlockType;
 import net.minecraft.core.Direction;

src/main/java/com/voxelutopia/ultramarine/datagen/ModItemModelProvider.java

@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class ModItemModelProvider extends ItemModelProvider {
 

src/main/java/com/voxelutopia/ultramarine/datagen/ModItemTagProvider.java

@@ -10,7 +10,6 @@
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.registries.RegistryObject;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java

@@ -8,7 +8,6 @@
 import com.voxelutopia.ultramarine.world.block.ConsumableDecorativeBlock;
 import com.voxelutopia.ultramarine.world.block.StackableHalfBlock;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;

src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java

@@ -2,10 +2,10 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.voxelutopia.ultramarine.data.ModItemTags;
-import com.voxelutopia.ultramarine.datagen.recipe.ChiselTableRecipeBuilder;
-import com.voxelutopia.ultramarine.datagen.recipe.CompositeSmeltingRecipeBuilder;
 import com.voxelutopia.ultramarine.data.registry.ItemRegistry;
 import com.voxelutopia.ultramarine.data.registry.RecipeSerializerRegistry;
+import com.voxelutopia.ultramarine.datagen.recipe.ChiselTableRecipeBuilder;
+import com.voxelutopia.ultramarine.datagen.recipe.CompositeSmeltingRecipeBuilder;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.advancements.critereon.*;
 import net.minecraft.data.DataGenerator;

src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java

@@ -9,8 +9,6 @@
 import com.voxelutopia.ultramarine.world.feature.ModPlacedFeatures;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
@@ -30,15 +28,13 @@
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.item.ItemExpireEvent;
-import net.minecraftforge.event.entity.living.LivingSpawnEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.village.VillagerTradesEvent;
 import net.minecraftforge.event.village.WandererTradesEvent;
@@ -49,7 +45,6 @@
 import org.slf4j.Logger;
 
 import java.util.List;
-import java.util.Optional;
 
 @Mod.EventBusSubscriber
 public class CommonEventHandler {

src/main/java/com/voxelutopia/ultramarine/world/block/AxialBlock.java

@@ -3,7 +3,6 @@
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.phys.shapes.VoxelShape;

src/main/java/com/voxelutopia/ultramarine/world/block/BaseAxialBlock.java

@@ -1,9 +1,5 @@
 package com.voxelutopia.ultramarine.world.block;
 
-import com.voxelutopia.ultramarine.world.block.AxialBlock;
-import com.voxelutopia.ultramarine.world.block.BaseBlock;
-import com.voxelutopia.ultramarine.world.block.BaseBlockProperty;
-import com.voxelutopia.ultramarine.world.block.BaseBlockPropertyHolder;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.Block;

src/main/java/com/voxelutopia/ultramarine/world/block/BaseBlock.java

@@ -2,13 +2,11 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 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 BaseBlock extends Block implements BaseBlockPropertyHolder {
 

src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalBlock.java

@@ -3,14 +3,11 @@
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.DirectionalBlock;
 import net.minecraft.world.level.block.HorizontalDirectionalBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class BaseHorizontalDirectionalBlock extends HorizontalDirectionalBlock implements BaseBlockPropertyHolder {
 

src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalSlab.java

@@ -10,7 +10,6 @@
 import net.minecraft.world.level.block.state.properties.*;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class BaseHorizontalDirectionalSlab extends BaseSlab implements SimpleWaterloggedBlock {
 

src/main/java/com/voxelutopia/ultramarine/world/block/BaseSlab.java

@@ -2,12 +2,10 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 
 public class BaseSlab extends SlabBlock implements BaseBlockPropertyHolder {
 

src/main/java/com/voxelutopia/ultramarine/world/block/BeamHead.java

@@ -1,6 +1,5 @@
 package com.voxelutopia.ultramarine.world.block;
 
-import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;

src/main/java/com/voxelutopia/ultramarine/world/block/BottleGourd.java

@@ -26,7 +26,6 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class BottleGourd extends DecorativeBlock implements EntityBlock {
 

src/main/java/com/voxelutopia/ultramarine/world/block/Bracket.java

@@ -6,14 +6,12 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SimpleWaterloggedBlock;
-import net.minecraft.world.level.block.entity.Hopper;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;