Import Optimization

2026-02-01 21:02:26 -06:00
parent 44663e8b3e
commit 65b56aeab2
34 changed files with 8 additions and 99 deletions
@@ -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;
@@ -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;

@@ -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;

@@ -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) {
@@ -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;
@@ -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;
@@ -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;

@@ -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;

@@ -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;
@@ -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;

@@ -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;
@@ -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<BlockPos> COORDINATES =
            register("coordinates", blockPosBuilder -> blockPosBuilder.codec(BlockPos.CODEC));

+    public static final ComponentType<Boolean> SMOKING =
+            register("smoking", booleanBuilder -> booleanBuilder.codec(Codec.BOOL));
+
    private static <T>ComponentType<T> register(String name, UnaryOperator<ComponentType.Builder<T>> builderOperator){
        return Registry.register(Registries.DATA_COMPONENT_TYPE, Identifier.of(AcesBS.MOD_ID, name),
                builderOperator.apply(ComponentType.builder()).build());
@@ -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;
@@ -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;
@@ -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 {
@@ -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;

@@ -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;
@@ -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);
@@ -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;

@@ -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<LightningStrikeEnchantmentEffect> CODEC = MapCodec.unit(LightningStrikeEnchantmentEffect::new);
@@ -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;
@@ -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 {
@@ -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<ArmorMaterial> BERSERKERS = registerArmorMaterial("berserkers",
@@ -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;
@@ -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 {

@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;

@@ -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;
@@ -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;
@@ -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 {
@@ -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;