From 94f282d84f568db08fbe8563c716498208c680a3 Mon Sep 17 00:00:00 2001 From: LocusAzzurro Date: Thu, 22 Aug 2024 03:36:50 +0200 Subject: [PATCH] :coffin: optimize imports and unused fields --- .../com/voxelutopia/ultramarine/Ultramarine.java | 3 --- .../integration/jei/ChiselTableRecipeCategory.java | 1 - .../client/integration/jei/UltramarinePlugin.java | 1 - .../ultramarine/client/screen/BrickKilnScreen.java | 1 - .../ultramarine/client/screen/ChiselTableScreen.java | 2 -- .../ultramarine/data/recipe/ChiselTableRecipe.java | 5 ++++- .../ultramarine/data/recipe/WoodworkingRecipe.java | 7 ++++--- .../data/registry/BlockEntityRegistry.java | 5 ++++- .../ultramarine/data/registry/BlockRegistry.java | 3 +-- .../data/registry/EntityTypeRegistry.java | 2 +- .../ultramarine/data/registry/ItemRegistry.java | 1 - .../ultramarine/data/registry/SoundRegistry.java | 2 -- .../data/registry/VillagerProfessionRegistry.java | 1 - .../ultramarine/datagen/BaseLootTableProvider.java | 5 ++++- .../ultramarine/datagen/MergedTextureProvider.java | 10 ++++++---- .../ultramarine/datagen/ModBlockModelProvider.java | 2 +- .../ultramarine/datagen/ModItemModelProvider.java | 1 - .../ultramarine/datagen/ModItemTagProvider.java | 1 - .../ultramarine/datagen/ModLootTableProvider.java | 1 - .../ultramarine/datagen/ModRecipeProvider.java | 4 ++-- .../ultramarine/event/CommonEventHandler.java | 5 ----- .../ultramarine/world/block/AxialBlock.java | 1 - .../ultramarine/world/block/BaseAxialBlock.java | 4 ---- .../ultramarine/world/block/BaseBlock.java | 2 -- .../world/block/BaseHorizontalDirectionalBlock.java | 3 --- .../world/block/BaseHorizontalDirectionalSlab.java | 1 - .../ultramarine/world/block/BaseSlab.java | 2 -- .../ultramarine/world/block/BeamHead.java | 1 - .../ultramarine/world/block/BottleGourd.java | 1 - .../voxelutopia/ultramarine/world/block/Bracket.java | 2 -- .../ultramarine/world/block/BrickKiln.java | 12 ++++++------ .../voxelutopia/ultramarine/world/block/Censer.java | 2 -- .../world/block/ChiralDirectionalBlock.java | 1 - .../ultramarine/world/block/ChiselTableMedium.java | 1 - .../ultramarine/world/block/DecorativeBlock.java | 1 - .../ultramarine/world/block/HangingLantern.java | 2 -- .../ultramarine/world/block/LongTableBlock.java | 2 -- .../ultramarine/world/block/OpeningBlock.java | 4 ---- .../voxelutopia/ultramarine/world/block/Rafter.java | 1 - .../ultramarine/world/block/RafterEnd.java | 2 -- .../ultramarine/world/block/RailingBlock.java | 4 +++- .../ultramarine/world/block/RailingSlant.java | 2 -- .../ultramarine/world/block/RoofRidgePanel.java | 6 ------ .../ultramarine/world/block/RoofTiles.java | 8 ++++++-- .../ultramarine/world/block/SideAxialBlock.java | 2 -- .../ultramarine/world/block/SideBlock.java | 1 - .../ultramarine/world/block/SixSideBlock.java | 2 -- .../ultramarine/world/block/StackableHalfBlock.java | 4 ---- .../ultramarine/world/block/StraightStairBlock.java | 3 --- .../ultramarine/world/block/WallSideBlock.java | 1 - .../ultramarine/world/block/WindChime.java | 2 -- .../world/block/WoodworkingWorkBench.java | 6 +++--- .../world/block/entity/BottleGourdBlockEntity.java | 1 - .../world/block/entity/BrickKilnBlockEntity.java | 4 +++- .../world/block/entity/CenserBlockEntity.java | 4 ---- .../block/entity/ContainerDecorativeBlockEntity.java | 3 --- .../world/block/menu/ChiselTableMenu.java | 4 +++- .../block/menu/ContainerDecorativeBlockMenu.java | 2 +- .../world/block/menu/WoodworkingWorkbenchMenu.java | 3 +-- .../world/block/state/ModBlockStateProperties.java | 5 ++++- .../world/block/state/StackableBlockType.java | 1 - .../world/item/AquaticPlantBlockItem.java | 1 - .../ultramarine/world/item/WoodenMallet.java | 2 +- 63 files changed, 58 insertions(+), 121 deletions(-) diff --git a/src/main/java/com/voxelutopia/ultramarine/Ultramarine.java b/src/main/java/com/voxelutopia/ultramarine/Ultramarine.java index 9aa91e9a..66f60cb5 100644 --- a/src/main/java/com/voxelutopia/ultramarine/Ultramarine.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/client/integration/jei/ChiselTableRecipeCategory.java b/src/main/java/com/voxelutopia/ultramarine/client/integration/jei/ChiselTableRecipeCategory.java index e6b40452..427b2e1d 100644 --- a/src/main/java/com/voxelutopia/ultramarine/client/integration/jei/ChiselTableRecipeCategory.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/client/integration/jei/UltramarinePlugin.java b/src/main/java/com/voxelutopia/ultramarine/client/integration/jei/UltramarinePlugin.java index 299a2e43..8c015ba0 100644 --- a/src/main/java/com/voxelutopia/ultramarine/client/integration/jei/UltramarinePlugin.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/client/screen/BrickKilnScreen.java b/src/main/java/com/voxelutopia/ultramarine/client/screen/BrickKilnScreen.java index ef76b6ac..7d288e4b 100644 --- a/src/main/java/com/voxelutopia/ultramarine/client/screen/BrickKilnScreen.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/client/screen/ChiselTableScreen.java b/src/main/java/com/voxelutopia/ultramarine/client/screen/ChiselTableScreen.java index 221e4a79..edf7f483 100644 --- a/src/main/java/com/voxelutopia/ultramarine/client/screen/ChiselTableScreen.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/data/recipe/ChiselTableRecipe.java b/src/main/java/com/voxelutopia/ultramarine/data/recipe/ChiselTableRecipe.java index df34fb6e..b22e4208 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/recipe/ChiselTableRecipe.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/data/recipe/WoodworkingRecipe.java b/src/main/java/com/voxelutopia/ultramarine/data/recipe/WoodworkingRecipe.java index 09f51dcb..c57185b9 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/recipe/WoodworkingRecipe.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockEntityRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockEntityRegistry.java index 4da8596a..ff445fb7 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockEntityRegistry.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java index 00a3f308..4b1d0ef5 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/EntityTypeRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/EntityTypeRegistry.java index 3d62fe6e..f766639d 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/EntityTypeRegistry.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index a019aac2..6ab5e833 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -826,7 +826,6 @@ public class ItemRegistry { */ public static final RegistryObject WOODEN_MALLET = ITEMS.register("wooden_mallet", WoodenMallet::new); - //public static final RegistryObject GUIDE_BOOK = simpleItem("guide_book", ModCreativeTab.TOOLS); public static final RegistryObject 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 BLUE_AND_WHITE_PORCELAIN_SHOVEL = ITEMS.register("blue_and_white_porcelain_shovel", diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/SoundRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/SoundRegistry.java index 6cea232b..9449bb44 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/SoundRegistry.java +++ b/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 SOUND_EVENT = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, Ultramarine.MOD_ID); diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/VillagerProfessionRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/VillagerProfessionRegistry.java index 68c54523..47be5e85 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/VillagerProfessionRegistry.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/BaseLootTableProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/BaseLootTableProvider.java index 5c1c01f2..5f56422b 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/BaseLootTableProvider.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/MergedTextureProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/MergedTextureProvider.java index 939396ab..9c738ddc 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/MergedTextureProvider.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java index b75de864..a491c3cd 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModItemModelProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModItemModelProvider.java index 1d3535a1..0dd7d247 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModItemModelProvider.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModItemTagProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModItemTagProvider.java index a065deab..4dbf0553 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModItemTagProvider.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java index d9d2a93e..4fbf4d59 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java index 04c13f9e..daeb7f18 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java b/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java index e57e0de1..a2548978 100644 --- a/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java +++ b/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,7 +28,6 @@ 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; @@ -38,7 +35,6 @@ 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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/AxialBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/AxialBlock.java index ccaebcf8..53854bc1 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/AxialBlock.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseAxialBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BaseAxialBlock.java index 0c40a5ba..a1b04765 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseAxialBlock.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BaseBlock.java index 062333c4..b17e3996 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseBlock.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalBlock.java index 0aee701b..3bba7133 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalBlock.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalSlab.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalSlab.java index df568aaf..341353b5 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseHorizontalDirectionalSlab.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseSlab.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BaseSlab.java index be10f221..0b2ec18e 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BaseSlab.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BeamHead.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BeamHead.java index 2e52dbe7..6e2302d1 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BeamHead.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BottleGourd.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BottleGourd.java index d5e6831b..c913d912 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BottleGourd.java +++ b/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 { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/Bracket.java b/src/main/java/com/voxelutopia/ultramarine/world/block/Bracket.java index 8d4dce80..964d9993 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/Bracket.java +++ b/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; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/BrickKiln.java b/src/main/java/com/voxelutopia/ultramarine/world/block/BrickKiln.java index 902937d0..cca544e9 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/BrickKiln.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/BrickKiln.java @@ -5,13 +5,14 @@ import com.voxelutopia.ultramarine.world.block.entity.BrickKilnBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.world.*; +import net.minecraft.world.Containers; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; @@ -20,7 +21,9 @@ import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.entity.*; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; 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; @@ -28,9 +31,6 @@ import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.minecraft.world.phys.shapes.Shapes; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.items.wrapper.CombinedInvWrapper; import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.network.NetworkHooks; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/Censer.java b/src/main/java/com/voxelutopia/ultramarine/world/block/Censer.java index c4a66e90..7cbacd6f 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/Censer.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/Censer.java @@ -6,7 +6,6 @@ import com.voxelutopia.ultramarine.world.block.entity.CenserBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; @@ -21,7 +20,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.items.ItemHandlerHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/ChiralDirectionalBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/ChiralDirectionalBlock.java index 0c0dbec4..76563681 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/ChiralDirectionalBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/ChiralDirectionalBlock.java @@ -5,7 +5,6 @@ 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.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/ChiselTableMedium.java b/src/main/java/com/voxelutopia/ultramarine/world/block/ChiselTableMedium.java index 1d7cd9f5..f33a0bb9 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/ChiselTableMedium.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/ChiselTableMedium.java @@ -13,7 +13,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java index 8bc07ebb..6c3a3826 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java @@ -24,7 +24,6 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.function.Function; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/HangingLantern.java b/src/main/java/com/voxelutopia/ultramarine/world/block/HangingLantern.java index ab318e76..ddb7579f 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/HangingLantern.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/HangingLantern.java @@ -22,8 +22,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.NotNull; -import java.util.function.Function; - public class HangingLantern extends DecorativeBlock { public static final IntegerProperty LANTERNS = ModBlockStateProperties.LANTERNS; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/LongTableBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/LongTableBlock.java index be5bb73d..425885a5 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/LongTableBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/LongTableBlock.java @@ -1,8 +1,6 @@ package com.voxelutopia.ultramarine.world.block; -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.world.block.state.ModBlockStateProperties; import net.minecraft.Util; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/OpeningBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/OpeningBlock.java index 75160c20..0ef64e00 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/OpeningBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/OpeningBlock.java @@ -1,6 +1,5 @@ package com.voxelutopia.ultramarine.world.block; -import com.voxelutopia.ultramarine.data.shape.ShapeFunction; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -15,15 +14,12 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.*; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.material.Material; 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 java.util.function.Function; - public class OpeningBlock extends DecorativeBlock{ public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/Rafter.java b/src/main/java/com/voxelutopia/ultramarine/world/block/Rafter.java index 6a8ce353..a0548e89 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/Rafter.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/Rafter.java @@ -13,7 +13,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import java.util.function.Function; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/RafterEnd.java b/src/main/java/com/voxelutopia/ultramarine/world/block/RafterEnd.java index 4dc29114..bb0c6092 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/RafterEnd.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/RafterEnd.java @@ -12,9 +12,7 @@ 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.level.block.state.properties.EnumProperty; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import java.util.function.Function; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/RailingBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/RailingBlock.java index 126978d1..26c6b6e1 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/RailingBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/RailingBlock.java @@ -8,7 +8,9 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RenderShape; +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.BlockStateProperties; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/RailingSlant.java b/src/main/java/com/voxelutopia/ultramarine/world/block/RailingSlant.java index 42ab1a55..b2625c61 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/RailingSlant.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/RailingSlant.java @@ -1,11 +1,9 @@ package com.voxelutopia.ultramarine.world.block; import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties; -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.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; public class RailingSlant extends SideAxialBlock{ diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/RoofRidgePanel.java b/src/main/java/com/voxelutopia/ultramarine/world/block/RoofRidgePanel.java index 44419109..05792cc7 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/RoofRidgePanel.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/RoofRidgePanel.java @@ -1,15 +1,9 @@ package com.voxelutopia.ultramarine.world.block; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; -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.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/RoofTiles.java b/src/main/java/com/voxelutopia/ultramarine/world/block/RoofTiles.java index b47fc699..91821fd3 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/RoofTiles.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/RoofTiles.java @@ -16,11 +16,15 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.*; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.phys.BlockHitResult; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/SideAxialBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/SideAxialBlock.java index 9f274599..329433b6 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/SideAxialBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/SideAxialBlock.java @@ -18,8 +18,6 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import java.util.Map; - public class SideAxialBlock extends BaseHorizontalDirectionalBlock implements AxialBlock, SimpleWaterloggedBlock { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/SideBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/SideBlock.java index 195326e9..564247fd 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/SideBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/SideBlock.java @@ -9,7 +9,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import java.util.Map; -import java.util.function.Function; public interface SideBlock extends SimpleWaterloggedBlock { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/SixSideBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/SixSideBlock.java index 0a9702fe..a7e48860 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/SixSideBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/SixSideBlock.java @@ -18,8 +18,6 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import java.util.Map; - public class SixSideBlock extends Block implements BaseBlockPropertyHolder, SimpleWaterloggedBlock, SideBlock { protected final BaseBlockProperty property; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/StackableHalfBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/StackableHalfBlock.java index 087c8ad3..d5abe022 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/StackableHalfBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/StackableHalfBlock.java @@ -3,7 +3,6 @@ import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties; import com.voxelutopia.ultramarine.world.block.state.StackableBlockType; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; @@ -11,9 +10,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.level.block.state.properties.SlabType; -import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/StraightStairBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/StraightStairBlock.java index b92aeee3..912a99da 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/StraightStairBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/StraightStairBlock.java @@ -6,8 +6,6 @@ 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.SlabBlock; -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; @@ -16,7 +14,6 @@ import net.minecraft.world.level.block.state.properties.Half; 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; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/WallSideBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/WallSideBlock.java index 764127df..41dd234e 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/WallSideBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/WallSideBlock.java @@ -19,7 +19,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import javax.annotation.Nullable; -import java.util.Map; public class WallSideBlock extends Block implements BaseBlockPropertyHolder, SimpleWaterloggedBlock, SideBlock { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/WindChime.java b/src/main/java/com/voxelutopia/ultramarine/world/block/WindChime.java index 9881053c..b1ef1e9c 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/WindChime.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/WindChime.java @@ -1,13 +1,11 @@ package com.voxelutopia.ultramarine.world.block; -import com.voxelutopia.ultramarine.Ultramarine; import com.voxelutopia.ultramarine.data.shape.RawVoxelShape; import com.voxelutopia.ultramarine.data.shape.ShapeFunction; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.state.BlockState; import java.util.Random; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/WoodworkingWorkBench.java b/src/main/java/com/voxelutopia/ultramarine/world/block/WoodworkingWorkBench.java index 71870d7b..ee1cca6f 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/WoodworkingWorkBench.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/WoodworkingWorkBench.java @@ -5,17 +5,17 @@ import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.MenuProvider; import net.minecraft.world.SimpleMenuProvider; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ContainerLevelAccess; -import net.minecraft.world.inventory.StonecutterMenu; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.DirectionProperty; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BottleGourdBlockEntity.java b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BottleGourdBlockEntity.java index d5e51ad6..1437cf26 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BottleGourdBlockEntity.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BottleGourdBlockEntity.java @@ -2,7 +2,6 @@ import com.voxelutopia.ultramarine.data.registry.BlockEntityRegistry; import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.Potions; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BrickKilnBlockEntity.java b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BrickKilnBlockEntity.java index 932ee48d..0bd5d62c 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BrickKilnBlockEntity.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/BrickKilnBlockEntity.java @@ -18,7 +18,9 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; -import net.minecraft.world.*; +import net.minecraft.world.Container; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.SimpleContainer; import net.minecraft.world.entity.ExperienceOrb; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/CenserBlockEntity.java b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/CenserBlockEntity.java index e2b2de07..1488395b 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/CenserBlockEntity.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/CenserBlockEntity.java @@ -6,16 +6,12 @@ import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.ai.targeting.TargetingConditions; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; -import java.util.List; - import static com.voxelutopia.ultramarine.world.block.DecorativeBlock.LIT; public class CenserBlockEntity extends BlockEntity{ diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/ContainerDecorativeBlockEntity.java b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/ContainerDecorativeBlockEntity.java index 77a71158..cdb50d3e 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/entity/ContainerDecorativeBlockEntity.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/entity/ContainerDecorativeBlockEntity.java @@ -5,10 +5,8 @@ import com.voxelutopia.ultramarine.world.block.menu.ContainerDecorativeBlockMenu; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; -import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.ContainerHelper; @@ -18,7 +16,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.registries.ForgeRegistries; public class ContainerDecorativeBlockEntity extends RandomizableContainerBlockEntity { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ChiselTableMenu.java b/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ChiselTableMenu.java index 63c3b5bf..0bb311e2 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ChiselTableMenu.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ChiselTableMenu.java @@ -11,7 +11,9 @@ import net.minecraft.world.SimpleContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.*; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ContainerLevelAccess; +import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ContainerDecorativeBlockMenu.java b/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ContainerDecorativeBlockMenu.java index 82850b91..d071e63f 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ContainerDecorativeBlockMenu.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/menu/ContainerDecorativeBlockMenu.java @@ -1,7 +1,7 @@ package com.voxelutopia.ultramarine.world.block.menu; -import com.voxelutopia.ultramarine.data.registry.MenuTypeRegistry; import com.voxelutopia.ultramarine.data.ContainerType; +import com.voxelutopia.ultramarine.data.registry.MenuTypeRegistry; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/menu/WoodworkingWorkbenchMenu.java b/src/main/java/com/voxelutopia/ultramarine/world/block/menu/WoodworkingWorkbenchMenu.java index 7bfa82d0..a6bfe462 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/menu/WoodworkingWorkbenchMenu.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/menu/WoodworkingWorkbenchMenu.java @@ -1,12 +1,11 @@ package com.voxelutopia.ultramarine.world.block.menu; import com.google.common.collect.Lists; +import com.voxelutopia.ultramarine.data.recipe.WoodworkingRecipe; import com.voxelutopia.ultramarine.data.registry.BlockRegistry; import com.voxelutopia.ultramarine.data.registry.MenuTypeRegistry; import com.voxelutopia.ultramarine.data.registry.RecipeTypeRegistry; -import com.voxelutopia.ultramarine.data.recipe.WoodworkingRecipe; import com.voxelutopia.ultramarine.data.registry.SoundRegistry; -import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/state/ModBlockStateProperties.java b/src/main/java/com/voxelutopia/ultramarine/world/block/state/ModBlockStateProperties.java index 5f3870e3..a4a7a238 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/state/ModBlockStateProperties.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/state/ModBlockStateProperties.java @@ -2,7 +2,10 @@ import com.voxelutopia.ultramarine.world.block.RoofTiles; import net.minecraft.core.Direction; -import net.minecraft.world.level.block.state.properties.*; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.block.state.properties.IntegerProperty; public class ModBlockStateProperties { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/state/StackableBlockType.java b/src/main/java/com/voxelutopia/ultramarine/world/block/state/StackableBlockType.java index 696900d8..28cc4bbe 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/state/StackableBlockType.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/state/StackableBlockType.java @@ -1,6 +1,5 @@ package com.voxelutopia.ultramarine.world.block.state; -import com.voxelutopia.ultramarine.world.block.StackableHalfBlock; import net.minecraft.util.StringRepresentable; public enum StackableBlockType implements StringRepresentable { diff --git a/src/main/java/com/voxelutopia/ultramarine/world/item/AquaticPlantBlockItem.java b/src/main/java/com/voxelutopia/ultramarine/world/item/AquaticPlantBlockItem.java index db5df334..18d9608d 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/item/AquaticPlantBlockItem.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/item/AquaticPlantBlockItem.java @@ -1,6 +1,5 @@ package com.voxelutopia.ultramarine.world.item; -import com.voxelutopia.ultramarine.data.ModCreativeTab; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; diff --git a/src/main/java/com/voxelutopia/ultramarine/world/item/WoodenMallet.java b/src/main/java/com/voxelutopia/ultramarine/world/item/WoodenMallet.java index ecc7b0d2..3dee81a5 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/item/WoodenMallet.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/item/WoodenMallet.java @@ -1,9 +1,9 @@ package com.voxelutopia.ultramarine.world.item; import com.voxelutopia.ultramarine.data.CreativeTabDefinitions; +import com.voxelutopia.ultramarine.data.registry.SoundRegistry; import com.voxelutopia.ultramarine.world.block.RailingBlock; import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties; -import com.voxelutopia.ultramarine.data.registry.SoundRegistry; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats;