From 65b56aeab2d2d945d8c2d6224a6370f16ae3c5b9 Mon Sep 17 00:00:00 2001 From: Vos Date: Sun, 1 Feb 2026 21:02:26 -0600 Subject: [PATCH] Import Optimization --- .../com/acethewildfire/acesbs/AcesBS.java | 1 - .../acethewildfire/acesbs/AcesBSClient.java | 1 - .../acesbs/block/custom/EntropyBlock.java | 4 ---- .../block/custom/StableEntropyBlock.java | 6 ----- .../custom/EntropicEntanglerEntity.java | 2 -- .../custom/EntropicStabilizerEntity.java | 2 -- .../compat/EntropicEntanglerCategory.java | 3 --- .../compat/EntropicEvisceratorCategory.java | 1 - .../compat/EntropicEvisceratorDisplay.java | 1 - .../compat/EntropicStabilizerCategory.java | 2 -- .../compat/EntropicStabilizerDisplay.java | 6 ----- .../component/ModDataComponentTypes.java | 4 ++++ .../acesbs/datagen/ModItemTagProvider.java | 1 - .../acesbs/datagen/ModModelProvider.java | 1 - .../acesbs/datagen/ModRecipeProvider.java | 2 -- .../acesbs/effect/BrickedUpEffect.java | 3 --- .../acesbs/effect/InfernalFireEffect.java | 1 - .../acesbs/effect/LemonEffect.java | 5 ---- .../acesbs/enchantment/ModEnchantments.java | 3 --- .../LightningStrikeEnchantmentEffect.java | 1 - .../acesbs/entity/client/FrenModel.java | 1 - .../entity/custom/CombustibleLemonEntity.java | 3 --- .../acesbs/item/ModArmorMaterials.java | 2 +- .../acesbs/item/ModToolMaterials.java | 3 --- .../acesbs/item/custom/HammerItem.java | 23 ++----------------- .../acesbs/item/custom/OracleLemon.java | 3 --- .../AbstractClientPlayerEntityMixin.java | 2 -- .../acesbs/mixin/CreeperTickMixin.java | 1 - .../acesbs/mixin/PlayerEntityMixin.java | 7 +----- .../recipe/EntropicEntanglerRecipeInput.java | 1 - .../EntropicEntanglerScreenHandler.java | 5 ---- .../EntropicEvisceratorScreenHandler.java | 2 -- .../acesbs/util/ModModelPredicates.java | 1 - .../acesbs/world/ModConfiguredFeatures.java | 3 --- 34 files changed, 8 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBS.java b/src/main/java/com/acethewildfire/acesbs/AcesBS.java index 4cf66c9..65a25a9 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBS.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBS.java @@ -25,7 +25,6 @@ import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.fabricmc.fabric.api.registry.FabricBrewingRecipeRegistryBuilder; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.StrippableBlockRegistry; -import net.minecraft.block.FireBlock; import net.minecraft.item.Items; import net.minecraft.potion.Potions; import org.slf4j.Logger; diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java index e3a48a0..9be3a24 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java @@ -15,7 +15,6 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; -import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.screen.ingame.HandledScreens; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java index 54c130f..98ed8ec 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java +++ b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java @@ -1,7 +1,6 @@ package com.acethewildfire.acesbs.block.custom; import com.acethewildfire.acesbs.AcesBS; -import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.util.ModTags; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -10,15 +9,12 @@ import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.registry.Registries; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; -import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/acethewildfire/acesbs/block/custom/StableEntropyBlock.java b/src/main/java/com/acethewildfire/acesbs/block/custom/StableEntropyBlock.java index 4f838b5..e738bfc 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/custom/StableEntropyBlock.java +++ b/src/main/java/com/acethewildfire/acesbs/block/custom/StableEntropyBlock.java @@ -1,6 +1,5 @@ package com.acethewildfire.acesbs.block.custom; -import com.acethewildfire.acesbs.AcesBS; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; @@ -12,14 +11,9 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Direction.AxisDirection; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.BlockView; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class StableEntropyBlock extends Block { public StableEntropyBlock(Settings settings) { diff --git a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java index 3a859b7..89ca08c 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java +++ b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java @@ -2,9 +2,7 @@ package com.acethewildfire.acesbs.block.entity.custom; import com.acethewildfire.acesbs.block.custom.EntropicEntangler; import com.acethewildfire.acesbs.block.entity.EntanglerInventory; -import com.acethewildfire.acesbs.block.entity.ImplementedInventory; import com.acethewildfire.acesbs.block.entity.ModBlockEntities; -import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.recipe.EntropicEntanglerRecipe; import com.acethewildfire.acesbs.recipe.EntropicEntanglerRecipeInput; import com.acethewildfire.acesbs.recipe.ModRecipies; diff --git a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java index 03de53a..20eda5b 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java +++ b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java @@ -3,7 +3,6 @@ package com.acethewildfire.acesbs.block.entity.custom; import com.acethewildfire.acesbs.block.custom.EntropicStabilizer; import com.acethewildfire.acesbs.block.entity.ImplementedInventory; import com.acethewildfire.acesbs.block.entity.ModBlockEntities; -import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.recipe.EntropicStabilizerRecipe; import com.acethewildfire.acesbs.recipe.EntropicStabilizerRecipeInput; import com.acethewildfire.acesbs.recipe.ModRecipies; @@ -14,7 +13,6 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventories; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java index dbe3a00..4a5568e 100644 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java +++ b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java @@ -2,7 +2,6 @@ package com.acethewildfire.acesbs.compat; import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.block.ModBlocks; -import com.acethewildfire.acesbs.item.ModItems; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.Renderer; @@ -11,9 +10,7 @@ import me.shedaniel.rei.api.client.gui.widgets.Widgets; import me.shedaniel.rei.api.client.registry.display.DisplayCategory; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.item.Items; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java index 5892976..2b32630 100644 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java +++ b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java @@ -13,7 +13,6 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.item.Items; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java index 706b284..166b992 100644 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java +++ b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java @@ -1,7 +1,6 @@ package com.acethewildfire.acesbs.compat; import com.acethewildfire.acesbs.recipe.EntropicEvisceratorRecipe; -import com.acethewildfire.acesbs.recipe.EntropicStabilizerRecipe; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java index bdff416..99a4d77 100644 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java +++ b/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java @@ -11,13 +11,11 @@ import me.shedaniel.rei.api.client.registry.display.DisplayCategory; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.EntryStacks; import net.minecraft.item.Items; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java index e55e3d1..2337140 100644 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java +++ b/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java @@ -1,20 +1,14 @@ package com.acethewildfire.acesbs.compat; -import com.acethewildfire.acesbs.block.custom.EntropicStabilizer; import com.acethewildfire.acesbs.recipe.EntropicStabilizerRecipe; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.entry.EntryStack; -import me.shedaniel.rei.api.common.registry.RecipeManagerContext; import me.shedaniel.rei.api.common.util.EntryIngredients; import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.nbt.NbtCompound; import net.minecraft.recipe.RecipeEntry; -import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Optional; public class EntropicStabilizerDisplay extends BasicDisplay { private RecipeEntry recipe; diff --git a/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java b/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java index 0f55498..651a08d 100644 --- a/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java +++ b/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java @@ -1,6 +1,7 @@ package com.acethewildfire.acesbs.component; import com.acethewildfire.acesbs.AcesBS; +import com.mojang.serialization.Codec; import net.minecraft.component.ComponentType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -14,6 +15,9 @@ public class ModDataComponentTypes { public static final ComponentType COORDINATES = register("coordinates", blockPosBuilder -> blockPosBuilder.codec(BlockPos.CODEC)); + public static final ComponentType SMOKING = + register("smoking", booleanBuilder -> booleanBuilder.codec(Codec.BOOL)); + private static ComponentType register(String name, UnaryOperator> builderOperator){ return Registry.register(Registries.DATA_COMPONENT_TYPE, Identifier.of(AcesBS.MOD_ID, name), builderOperator.apply(ComponentType.builder()).build()); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java index d76e93e..8cb9945 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java @@ -7,7 +7,6 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.item.Items; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 54b272c..8fecc32 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -6,7 +6,6 @@ import com.acethewildfire.acesbs.block.custom.TobaccoCrop; import com.acethewildfire.acesbs.item.ModItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; -import net.minecraft.block.Blocks; import net.minecraft.data.client.*; import net.minecraft.item.ArmorItem; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index 4719bb2..bf414ba 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -9,7 +9,6 @@ import net.minecraft.block.Blocks; import net.minecraft.data.server.recipe.RecipeExporter; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; -import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.recipe.*; @@ -17,7 +16,6 @@ import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.Identifier; -import java.util.List; import java.util.concurrent.CompletableFuture; public class ModRecipeProvider extends FabricRecipeProvider { diff --git a/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java index 3060376..f18168a 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java @@ -1,14 +1,11 @@ package com.acethewildfire.acesbs.effect; -import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.sounds.ModSounds; import net.minecraft.entity.Flutterer; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; -import net.minecraft.entity.effect.StatusEffects; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; diff --git a/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java index 044a0c5..8a8512e 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java @@ -1,6 +1,5 @@ package com.acethewildfire.acesbs.effect; -import com.acethewildfire.acesbs.AcesBS; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; diff --git a/src/main/java/com/acethewildfire/acesbs/effect/LemonEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/LemonEffect.java index 195405d..3668a58 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/LemonEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/LemonEffect.java @@ -1,14 +1,9 @@ package com.acethewildfire.acesbs.effect; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.BackgroundRenderer; -import net.minecraft.client.render.RenderTickCounter; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; -import static net.minecraft.client.render.BackgroundRenderer.applyFog; - public class LemonEffect extends StatusEffect { public LemonEffect(StatusEffectCategory category, int color) { super(category, color); diff --git a/src/main/java/com/acethewildfire/acesbs/enchantment/ModEnchantments.java b/src/main/java/com/acethewildfire/acesbs/enchantment/ModEnchantments.java index b2a6e89..a8f6b27 100644 --- a/src/main/java/com/acethewildfire/acesbs/enchantment/ModEnchantments.java +++ b/src/main/java/com/acethewildfire/acesbs/enchantment/ModEnchantments.java @@ -5,13 +5,10 @@ import com.acethewildfire.acesbs.enchantment.custom.LightningStrikeEnchantmentEf import net.minecraft.component.EnchantmentEffectComponentTypes; import net.minecraft.component.type.AttributeModifierSlot; import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.Enchantments; import net.minecraft.enchantment.effect.EnchantmentEffectTarget; import net.minecraft.registry.Registerable; -import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.EnchantmentTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java b/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java index b78a173..710002c 100644 --- a/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java @@ -9,7 +9,6 @@ import net.minecraft.entity.SpawnReason; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.Vec3i; public record LightningStrikeEnchantmentEffect() implements EnchantmentEntityEffect { public static final MapCodec CODEC = MapCodec.unit(LightningStrikeEnchantmentEffect::new); diff --git a/src/main/java/com/acethewildfire/acesbs/entity/client/FrenModel.java b/src/main/java/com/acethewildfire/acesbs/entity/client/FrenModel.java index 4eaf203..99a72a9 100644 --- a/src/main/java/com/acethewildfire/acesbs/entity/client/FrenModel.java +++ b/src/main/java/com/acethewildfire/acesbs/entity/client/FrenModel.java @@ -4,7 +4,6 @@ import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.entity.custom.FrenEntity; import net.minecraft.client.model.*; import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.render.entity.model.SinglePartEntityModel; import net.minecraft.client.util.math.MatrixStack; diff --git a/src/main/java/com/acethewildfire/acesbs/entity/custom/CombustibleLemonEntity.java b/src/main/java/com/acethewildfire/acesbs/entity/custom/CombustibleLemonEntity.java index 6dafa99..2682662 100644 --- a/src/main/java/com/acethewildfire/acesbs/entity/custom/CombustibleLemonEntity.java +++ b/src/main/java/com/acethewildfire/acesbs/entity/custom/CombustibleLemonEntity.java @@ -3,17 +3,14 @@ package com.acethewildfire.acesbs.entity.custom; import com.acethewildfire.acesbs.entity.ModEntities; import com.acethewildfire.acesbs.item.ModItems; import net.minecraft.block.AbstractFireBlock; -import net.minecraft.client.util.math.Vector2f; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.PersistentProjectileEntity; -import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; import net.minecraft.world.World; public class CombustibleLemonEntity extends PersistentProjectileEntity { diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java b/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java index 0ce3a07..36f35fd 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java @@ -25,7 +25,7 @@ public class ModArmorMaterials { map.put(ArmorItem.Type.CHESTPLATE, 6); map.put(ArmorItem.Type.HELMET, 2); map.put(ArmorItem.Type.BODY, 4); - }), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, () -> Ingredient.ofItems(ModItems.PRISMA_STEEL), + }), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, () -> Ingredient.ofItems(PrismaSteelItems.PRISMA_STEEL), List.of(new ArmorMaterial.Layer(Identifier.of(AcesBS.MOD_ID, "prisma_steel"))), 0, 0)); public static final RegistryEntry BERSERKERS = registerArmorMaterial("berserkers", diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java b/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java index 7004210..9ca33cf 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java @@ -3,11 +3,8 @@ package com.acethewildfire.acesbs.item; import com.acethewildfire.acesbs.util.ModTags; import com.google.common.base.Suppliers; import net.minecraft.block.Block; -import net.minecraft.item.Items; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.tag.BlockTags; -import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import java.util.function.Supplier; diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java b/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java index ab12fd8..25e44f9 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java @@ -1,35 +1,16 @@ package com.acethewildfire.acesbs.item.custom; -import com.acethewildfire.acesbs.AcesBS; -import com.acethewildfire.acesbs.item.ModItems; -import com.acethewildfire.acesbs.util.ModTags; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.ItemEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.*; -import net.minecraft.loot.context.LootContextParameter; -import net.minecraft.loot.context.LootContextParameterSet; -import net.minecraft.loot.context.LootContextParameters; -import net.minecraft.loot.context.LootContextType; -import net.minecraft.registry.Registries; +import net.minecraft.item.MiningToolItem; +import net.minecraft.item.ToolMaterial; import net.minecraft.registry.tag.BlockTags; -import net.minecraft.registry.tag.TagKey; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; import java.util.ArrayList; import java.util.List; -import java.util.Random; public class HammerItem extends MiningToolItem { diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/OracleLemon.java b/src/main/java/com/acethewildfire/acesbs/item/custom/OracleLemon.java index e137008..a4c10e9 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/OracleLemon.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/OracleLemon.java @@ -1,13 +1,10 @@ package com.acethewildfire.acesbs.item.custom; -import net.minecraft.component.DataComponentTypes; -import net.minecraft.component.type.PotionContentsComponent; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.thrown.PotionEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.SplashPotionItem; -import net.minecraft.item.ThrowablePotionItem; import net.minecraft.stat.Stats; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; diff --git a/src/main/java/com/acethewildfire/acesbs/mixin/AbstractClientPlayerEntityMixin.java b/src/main/java/com/acethewildfire/acesbs/mixin/AbstractClientPlayerEntityMixin.java index 43c1a39..53955d3 100644 --- a/src/main/java/com/acethewildfire/acesbs/mixin/AbstractClientPlayerEntityMixin.java +++ b/src/main/java/com/acethewildfire/acesbs/mixin/AbstractClientPlayerEntityMixin.java @@ -1,11 +1,9 @@ package com.acethewildfire.acesbs.mixin; -import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.item.ModItems; import com.mojang.authlib.GameProfile; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.AbstractClientPlayerEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java b/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java index 44fe541..7bbdf57 100644 --- a/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java +++ b/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java @@ -9,7 +9,6 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/com/acethewildfire/acesbs/mixin/PlayerEntityMixin.java b/src/main/java/com/acethewildfire/acesbs/mixin/PlayerEntityMixin.java index 50307b4..ecd5dc2 100644 --- a/src/main/java/com/acethewildfire/acesbs/mixin/PlayerEntityMixin.java +++ b/src/main/java/com/acethewildfire/acesbs/mixin/PlayerEntityMixin.java @@ -1,19 +1,14 @@ package com.acethewildfire.acesbs.mixin; -import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.item.ModItems; -import net.minecraft.client.network.AbstractClientPlayerEntity; -import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.Item; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -25,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import java.util.Objects; @Mixin(PlayerEntity.class) -public abstract class PlayerEntityMixin { +public abstract class PlayerEntityMixin{ @Shadow @Final PlayerInventory inventory; diff --git a/src/main/java/com/acethewildfire/acesbs/recipe/EntropicEntanglerRecipeInput.java b/src/main/java/com/acethewildfire/acesbs/recipe/EntropicEntanglerRecipeInput.java index 394ea37..123f8d5 100644 --- a/src/main/java/com/acethewildfire/acesbs/recipe/EntropicEntanglerRecipeInput.java +++ b/src/main/java/com/acethewildfire/acesbs/recipe/EntropicEntanglerRecipeInput.java @@ -1,6 +1,5 @@ package com.acethewildfire.acesbs.recipe; -import com.acethewildfire.acesbs.block.entity.custom.EntropicEntanglerEntity; import net.minecraft.item.ItemStack; import net.minecraft.recipe.input.RecipeInput; diff --git a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java index dd5eab0..fc81381 100644 --- a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java +++ b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java @@ -1,17 +1,12 @@ package com.acethewildfire.acesbs.screen.custom; import com.acethewildfire.acesbs.block.entity.custom.EntropicEntanglerEntity; -import com.acethewildfire.acesbs.block.entity.custom.EntropicStabilizerEntity; -import com.acethewildfire.acesbs.item.ModItems; -import com.acethewildfire.acesbs.recipe.EntropicEntanglerRecipeInput; -import com.acethewildfire.acesbs.recipe.ModRecipies; import com.acethewildfire.acesbs.screen.ModScreenHandlers; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.screen.ArrayPropertyDelegate; import net.minecraft.screen.PropertyDelegate; import net.minecraft.screen.ScreenHandler; diff --git a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java index 2abd5ba..fac7dac 100644 --- a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java +++ b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java @@ -1,7 +1,6 @@ package com.acethewildfire.acesbs.screen.custom; import com.acethewildfire.acesbs.block.entity.custom.EntropicEvisceratorEntity; -import com.acethewildfire.acesbs.block.entity.custom.EntropicStabilizerEntity; import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.screen.ModScreenHandlers; import net.minecraft.block.entity.BlockEntity; @@ -9,7 +8,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.screen.ArrayPropertyDelegate; import net.minecraft.screen.PropertyDelegate; import net.minecraft.screen.ScreenHandler; diff --git a/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java b/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java index f54d5c6..df59823 100644 --- a/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java +++ b/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java @@ -5,7 +5,6 @@ import com.acethewildfire.acesbs.component.ModDataComponentTypes; import com.acethewildfire.acesbs.item.ModItems; import net.minecraft.client.item.ModelPredicateProviderRegistry; import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.util.Identifier; public class ModModelPredicates { diff --git a/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java b/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java index a7d4e74..f0e4d8c 100644 --- a/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java +++ b/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java @@ -12,18 +12,15 @@ import net.minecraft.structure.rule.RuleTest; import net.minecraft.structure.rule.TagMatchRuleTest; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DataPool; -import net.minecraft.util.collection.WeightedList; import net.minecraft.util.math.intprovider.ConstantIntProvider; import net.minecraft.util.math.intprovider.IntProvider; import net.minecraft.util.math.intprovider.UniformIntProvider; import net.minecraft.util.math.intprovider.WeightedListIntProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize; -import net.minecraft.world.gen.foliage.BlobFoliagePlacer; import net.minecraft.world.gen.foliage.CherryFoliagePlacer; import net.minecraft.world.gen.stateprovider.BlockStateProvider; import net.minecraft.world.gen.trunk.CherryTrunkPlacer; -import net.minecraft.world.gen.trunk.StraightTrunkPlacer; import java.util.List;