Removed most redirects, moved Enchantment Table mixin, cleanup

gradle.properties

@@ -11,7 +11,7 @@ loader_version= 0.13.3
 fabric_version = 0.48.0+1.18.2
 
 # Mod Properties
-mod_version = 1.4.3
+mod_version = 1.4.4
 maven_group = ru.bclib
 archives_base_name = bclib
 

src/main/java/ru/bclib/api/PostInitAPI.java

@@ -24,7 +24,14 @@ import ru.bclib.config.Configs;
 import ru.bclib.interfaces.PostInitable;
 import ru.bclib.interfaces.RenderLayerProvider;
 import ru.bclib.interfaces.TagProvider;
-import ru.bclib.interfaces.tools.*;
+import ru.bclib.interfaces.tools.AddMineableAxe;
+import ru.bclib.interfaces.tools.AddMineableHammer;
+import ru.bclib.interfaces.tools.AddMineableHoe;
+import ru.bclib.interfaces.tools.AddMineablePickaxe;
+import ru.bclib.interfaces.tools.AddMineableShears;
+import ru.bclib.interfaces.tools.AddMineableShovel;
+import ru.bclib.interfaces.tools.AddMineableSword;
+import ru.bclib.interfaces.tools.PreventMineableAdd;
 import ru.bclib.registry.BaseBlockEntities;
 
 import java.util.List;

src/main/java/ru/bclib/api/biomes/BCLBiomeBuilder.java

@@ -1,7 +1,6 @@
 package ru.bclib.api.biomes;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
@@ -15,10 +14,16 @@ import net.minecraft.tags.TagKey;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Mob;
-import net.minecraft.world.level.biome.*;
+import net.minecraft.world.level.biome.AmbientAdditionsSettings;
+import net.minecraft.world.level.biome.AmbientMoodSettings;
+import net.minecraft.world.level.biome.AmbientParticleSettings;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biome.BiomeBuilder;
 import net.minecraft.world.level.biome.Biome.BiomeCategory;
 import net.minecraft.world.level.biome.Biome.Precipitation;
+import net.minecraft.world.level.biome.BiomeGenerationSettings;
+import net.minecraft.world.level.biome.BiomeSpecialEffects;
+import net.minecraft.world.level.biome.MobSpawnSettings;
 import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -45,7 +50,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 public class BCLBiomeBuilder {
 	@FunctionalInterface

src/main/java/ru/bclib/api/biomes/BiomeAPI.java

@@ -25,7 +25,11 @@ import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.biome.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeGenerationSettings;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.biome.Climate;
 import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
@@ -43,12 +47,15 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
-import net.minecraft.world.level.levelgen.structure.StructureSet;
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.BCLib;
 import ru.bclib.entity.BCLEntityWrapper;
-import ru.bclib.interfaces.*;
+import ru.bclib.interfaces.BiomeSourceAccessor;
+import ru.bclib.interfaces.NoiseGeneratorSettingsProvider;
+import ru.bclib.interfaces.SurfaceMaterialProvider;
+import ru.bclib.interfaces.SurfaceProvider;
+import ru.bclib.interfaces.SurfaceRuleProvider;
 import ru.bclib.mixin.common.BiomeGenerationSettingsAccessor;
 import ru.bclib.mixin.common.MobSpawnSettingsAccessor;
 import ru.bclib.util.CollectionsUtil;
@@ -59,8 +66,14 @@ import ru.bclib.world.biomes.VanillaBiomeSettings;
 import ru.bclib.world.features.BCLFeature;
 import ru.bclib.world.generator.BiomePicker;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;

src/main/java/ru/bclib/api/features/BCLFeatureBuilder.java

@@ -4,14 +4,12 @@ import net.minecraft.data.worldgen.placement.PlacementUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.valueproviders.UniformInt;
 import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 import net.minecraft.world.level.levelgen.placement.BiomeFilter;
 import net.minecraft.world.level.levelgen.placement.CountOnEveryLayerPlacement;
 import net.minecraft.world.level.levelgen.placement.CountPlacement;
 import net.minecraft.world.level.levelgen.placement.InSquarePlacement;
-import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.minecraft.world.level.levelgen.placement.PlacementModifier;
 import net.minecraft.world.level.levelgen.placement.RarityFilter;
 import ru.bclib.world.features.BCLFeature;

src/main/java/ru/bclib/api/tag/CommonBlockTags.java

@@ -1,7 +1,6 @@
 package ru.bclib.api.tag;
 
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 
 public class CommonBlockTags {

src/main/java/ru/bclib/api/tag/TagAPI.java

@@ -3,7 +3,6 @@ package ru.bclib.api.tag;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.tags.Tag;

src/main/java/ru/bclib/blocks/BaseLeavesBlock.java

@@ -18,7 +18,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.api.tag.NamedBlockTags;
 import ru.bclib.api.tag.NamedItemTags;
-import ru.bclib.api.tag.NamedMineableTags;
 import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;

src/main/java/ru/bclib/blocks/BaseOreBlock.java

@@ -11,7 +11,6 @@ import net.minecraft.world.item.TieredItem;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.OreBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -19,11 +18,7 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import ru.bclib.api.tag.NamedCommonBlockTags;
-import ru.bclib.api.tag.NamedMineableTags;
-import ru.bclib.api.tag.TagAPI;
 import ru.bclib.interfaces.BlockModelProvider;
-import ru.bclib.interfaces.TagProvider;
 import ru.bclib.util.LootUtil;
 import ru.bclib.util.MHelper;
 

src/main/java/ru/bclib/blocks/BasePlantBlock.java

@@ -10,7 +10,6 @@ import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
@@ -31,16 +30,11 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
-import ru.bclib.api.tag.NamedMineableTags;
-import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.RenderLayerProvider;
-import ru.bclib.interfaces.TagProvider;
-import ru.bclib.interfaces.tools.AddMineableHoe;
-import ru.bclib.interfaces.tools.AddMineableShears;
 import ru.bclib.items.tool.BaseShearsItem;
 
 import java.util.List;

src/main/java/ru/bclib/blocks/BaseTerrainBlock.java

@@ -3,7 +3,6 @@ package ru.bclib.blocks;
 import com.google.common.collect.Maps;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;

src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java

@@ -9,7 +9,6 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import ru.bclib.api.tag.NamedBlockTags;
 import ru.bclib.api.tag.NamedItemTags;
-import ru.bclib.api.tag.NamedMineableTags;
 import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.RenderLayerProvider;

src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java

@@ -6,7 +6,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
@@ -30,13 +29,8 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.bclib.api.tag.NamedMineableTags;
-import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.RenderLayerProvider;
-import ru.bclib.interfaces.TagProvider;
-import ru.bclib.interfaces.tools.AddMineableHoe;
-import ru.bclib.interfaces.tools.AddMineableShears;
 import ru.bclib.items.tool.BaseShearsItem;
 
 import java.util.List;

src/main/java/ru/bclib/blocks/UpDownPlantBlock.java

@@ -5,7 +5,6 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
@@ -24,11 +23,8 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.bclib.api.tag.NamedMineableTags;
-import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.RenderLayerProvider;
-import ru.bclib.interfaces.TagProvider;
 import ru.bclib.interfaces.tools.AddMineableHoe;
 import ru.bclib.interfaces.tools.AddMineableShears;
 import ru.bclib.items.tool.BaseShearsItem;

src/main/java/ru/bclib/integration/ModIntegration.java

@@ -6,9 +6,6 @@ import net.minecraft.core.Registry;
 import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.biome.Biome;

src/main/java/ru/bclib/interfaces/SurvivesOnTags.java

@@ -5,7 +5,6 @@ import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.NetherrackBlock;
 import net.minecraft.world.level.block.state.BlockState;
 
 import java.util.Comparator;

src/main/java/ru/bclib/mixin/client/EnchantingTableBlockMixin.java

@@ -1,27 +0,0 @@
-package ru.bclib.mixin.client;
-
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.EnchantmentTableBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import ru.bclib.api.tag.CommonBlockTags;
-
-@Mixin(EnchantmentTableBlock.class)
-public abstract class EnchantingTableBlockMixin extends Block {
-	public EnchantingTableBlockMixin(Properties settings) {
-		super(settings);
-	}
-	
-	@Redirect(method = "isValidBookShelf", at = @At(
-		value = "INVOKE",
-		target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z"),
-		require = -1,
-		expect = -1
-	)
-	private static boolean bclib_isBookshelf(BlockState state, Block block) {
-		return block == Blocks.BOOKSHELF ? state.is(CommonBlockTags.BOOKSHELVES) : state.is(block);
-	}
-}

src/main/java/ru/bclib/mixin/common/BiomeGenerationSettingsAccessor.java

@@ -3,7 +3,6 @@ package ru.bclib.mixin.common;
 import net.minecraft.core.HolderSet;
 import net.minecraft.world.level.biome.BiomeGenerationSettings;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.GenerationStep.Carving;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;

src/main/java/ru/bclib/mixin/common/BlockStateBaseMixin.java

@@ -0,0 +1,22 @@
+package ru.bclib.mixin.common;
+
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import ru.bclib.util.MethodReplace;
+
+import java.util.function.Function;
+
+@Mixin(BlockStateBase.class)
+public class BlockStateBaseMixin {
+	@Inject(method = "is(Lnet/minecraft/world/level/block/Block;)Z", at = @At("HEAD"), cancellable = true)
+	private void bclib_replaceFunction(Block block, CallbackInfoReturnable<Boolean> info) {
+		Function<BlockStateBase, Boolean> replacement = MethodReplace.getBlockReplace(block);
+		if (replacement != null) {
+			info.setReturnValue(replacement.apply(BlockStateBase.class.cast(this)));
+		}
+	}
+}

src/main/java/ru/bclib/mixin/common/DiggerItemAccessor.java

@@ -3,16 +3,10 @@ package ru.bclib.mixin.common;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.DiggerItem;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.levelgen.placement.PlacedFeature;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import java.util.List;
-import java.util.function.Supplier;
-
 @Mixin(DiggerItem.class)
 public interface DiggerItemAccessor {
     @Accessor("blocks")

src/main/java/ru/bclib/mixin/common/DimensionTypeMixin.java

@@ -1,20 +1,13 @@
 package ru.bclib.mixin.common;
 
 import com.mojang.serialization.Lifecycle;
-import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.WritableRegistry;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
-import net.minecraft.world.level.levelgen.structure.StructureSet;
-import net.minecraft.world.level.levelgen.synth.NormalNoise;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/main/java/ru/bclib/mixin/common/EnchantingTableBlockMixin.java

@@ -0,0 +1,25 @@
+package ru.bclib.mixin.common;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.EnchantmentTableBlock;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import ru.bclib.api.tag.CommonBlockTags;
+import ru.bclib.util.MethodReplace;
+
+@Mixin(EnchantmentTableBlock.class)
+public abstract class EnchantingTableBlockMixin extends Block {
+	public EnchantingTableBlockMixin(Properties settings) {
+		super(settings);
+	}
+	
+	@Inject(method = "isValidBookShelf(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Z", at = @At("HEAD"), cancellable = true)
+	private static void bclib_isBookshelf(Level level, BlockPos blockPos, BlockPos blockPos2, CallbackInfoReturnable<Boolean> info) {
+		if (level.getBlockState(blockPos2).is(CommonBlockTags.BOOKSHELVES) && level.isEmptyBlock(blockPos.offset(blockPos2.getX() / 2, blockPos2.getY(), blockPos2.getZ() / 2))) info.setReturnValue(true);
+	}
+}

src/main/java/ru/bclib/mixin/common/ItemStackMixin.java

@@ -0,0 +1,22 @@
+package ru.bclib.mixin.common;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import ru.bclib.util.MethodReplace;
+
+import java.util.function.Function;
+
+@Mixin(ItemStack.class)
+public class ItemStackMixin {
+	@Inject(method = "is(Lnet/minecraft/world/item/Item;)Z", at = @At("HEAD"), cancellable = true)
+	private void bclib_replaceFunction(Item item, CallbackInfoReturnable<Boolean> info) {
+		Function<ItemStack, Boolean> replacement = MethodReplace.getItemReplace(item);
+		if (replacement != null) {
+			info.setReturnValue(replacement.apply(ItemStack.class.cast(this)));
+		}
+	}
+}

src/main/java/ru/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java

@@ -9,7 +9,12 @@ import net.minecraft.world.level.biome.Climate;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.levelgen.*;
+import net.minecraft.world.level.levelgen.Aquifer;
+import net.minecraft.world.level.levelgen.Beardifier;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.world.level.levelgen.NoiseChunk;
+import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
+import net.minecraft.world.level.levelgen.NoiseRouter;
 import net.minecraft.world.level.levelgen.blending.Blender;
 import net.minecraft.world.level.levelgen.carver.CarvingContext;
 import org.spongepowered.asm.mixin.Final;
@@ -21,7 +26,6 @@ import ru.bclib.interfaces.SurfaceProvider;
 
 import java.lang.reflect.Constructor;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 @Mixin(NoiseBasedChunkGenerator.class)
 public abstract class NoiseBasedChunkGeneratorMixin implements SurfaceProvider, NoiseGeneratorSettingsProvider {

src/main/java/ru/bclib/mixin/common/RecipeManagerMixin.java

@@ -1,6 +1,5 @@
 package ru.bclib.mixin.common;
 
-import net.minecraft.Util;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.crafting.Recipe;

src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java

@@ -6,11 +6,9 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.CustomSpawner;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess;
 import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.world.level.storage.WritableLevelData;

src/main/java/ru/bclib/mixin/common/StructureFeaturesAccessor.java

@@ -3,7 +3,6 @@ package ru.bclib.mixin.common;
 import net.minecraft.core.Holder;
 import net.minecraft.data.worldgen.StructureFeatures;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;

src/main/java/ru/bclib/mixin/common/SurfaceRulesContextAccessor.java

@@ -1,7 +1,6 @@
 package ru.bclib.mixin.common;
 
 import net.minecraft.core.Holder;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.levelgen.NoiseChunk;

src/main/java/ru/bclib/mixin/common/shears/BeehiveBlockMixin.java

@@ -1,17 +1,25 @@
 package ru.bclib.mixin.common.shears;
 
-import net.minecraft.world.item.Item;
+import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BeehiveBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.items.tool.BaseShearsItem;
+import ru.bclib.util.MethodReplace;
 
 @Mixin(BeehiveBlock.class)
 public class BeehiveBlockMixin {
-	@Redirect(method="use", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "use(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult;", at = @At("HEAD"))
-	public boolean bn_useProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult, CallbackInfoReturnable<InteractionResult> info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		MethodReplace.addItemReplace(Items.SHEARS, BaseShearsItem::isShear);
 	}
 }

src/main/java/ru/bclib/mixin/common/shears/DiggingEnchantmentMixin.java

@@ -1,17 +1,17 @@
 package ru.bclib.mixin.common.shears;
 
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.DiggingEnchantment;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.items.tool.BaseShearsItem;
 
 @Mixin(DiggingEnchantment.class)
 public class DiggingEnchantmentMixin {
-	@Redirect(method="canEnchant", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "canEnchant(Lnet/minecraft/world/item/ItemStack;)Z", at = @At("HEAD"), cancellable = true)
-	public boolean bn_mobInteractProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(ItemStack itemStack, CallbackInfoReturnable<Boolean> info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		if (BaseShearsItem.isShear(itemStack)) info.setReturnValue(true);
 	}
 }

src/main/java/ru/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java

@@ -17,14 +17,13 @@ import java.util.Set;
 
 @Mixin(ItemPredicate.class)
 public abstract class ItemPredicateBuilderMixin {
-	
 	@Shadow @Final private @Nullable Set<Item> items;
 	
 	@Inject(method = "matches", at = @At("HEAD"), cancellable = true)
-	void bclib_of(ItemStack itemStack, CallbackInfoReturnable<Boolean> cir) {
+	void bclib_isShears(ItemStack itemStack, CallbackInfoReturnable<Boolean> info) {
 		if (this.items != null && this.items.size() == 1 && this.items.contains(Items.SHEARS)) {
-			if (itemStack.is(CommonItemTags.SHEARS) ){
+			if (itemStack.is(CommonItemTags.SHEARS)) {
-				cir.setReturnValue(true);
+				info.setReturnValue(true);
 			}
 		}
 	}

src/main/java/ru/bclib/mixin/common/shears/MushroomCowMixin.java

@@ -1,17 +1,21 @@
 package ru.bclib.mixin.common.shears;
 
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.animal.MushroomCow;
-import net.minecraft.world.item.Item;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.items.tool.BaseShearsItem;
+import ru.bclib.util.MethodReplace;
 
 @Mixin(MushroomCow.class)
 public class MushroomCowMixin {
-	@Redirect(method="mobInteract", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "mobInteract(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult;", at = @At("HEAD"))
-	public boolean bn_mobInteractProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(Player player, InteractionHand interactionHand, CallbackInfoReturnable<InteractionResult> info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		MethodReplace.addItemReplace(Items.SHEARS, BaseShearsItem::isShear);
 	}
 }

src/main/java/ru/bclib/mixin/common/shears/PumpkinBlockMixin.java

@@ -1,17 +1,25 @@
 package ru.bclib.mixin.common.shears;
 
-import net.minecraft.world.item.Item;
+import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.PumpkinBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.items.tool.BaseShearsItem;
+import ru.bclib.util.MethodReplace;
 
 @Mixin(PumpkinBlock.class)
 public abstract class PumpkinBlockMixin {
-	@Redirect(method="use", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "use", at = @At("HEAD"))
-	public boolean bn_useProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult, CallbackInfoReturnable<InteractionResult> info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		MethodReplace.addItemReplace(Items.SHEARS, BaseShearsItem::isShear);
 	}
 }

src/main/java/ru/bclib/mixin/common/shears/SheepMixin.java

@@ -1,17 +1,21 @@
 package ru.bclib.mixin.common.shears;
 
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.animal.Sheep;
-import net.minecraft.world.item.Item;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.items.tool.BaseShearsItem;
+import ru.bclib.util.MethodReplace;
 
 @Mixin(Sheep.class)
 public class SheepMixin {
-	@Redirect(method="mobInteract", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "mobInteract(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult;", at = @At("HEAD"))
-	public boolean bn_mobInteractProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(Player player, InteractionHand interactionHand, CallbackInfoReturnable<InteractionResult> info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		MethodReplace.addItemReplace(Items.SHEARS, BaseShearsItem::isShear);
 	}
 }

src/main/java/ru/bclib/mixin/common/shears/SnowGolemMixin.java

@@ -1,17 +1,21 @@
 package ru.bclib.mixin.common.shears;
 
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.animal.SnowGolem;
-import net.minecraft.world.item.Item;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.items.tool.BaseShearsItem;
+import ru.bclib.util.MethodReplace;
 
 @Mixin(SnowGolem.class)
 public class SnowGolemMixin {
-	@Redirect(method="mobInteract", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "mobInteract(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult;", at = @At("HEAD"))
-	public boolean bn_mobInteractProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(Player player, InteractionHand interactionHand, CallbackInfoReturnable<InteractionResult> info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		MethodReplace.addItemReplace(Items.SHEARS, BaseShearsItem::isShear);
 	}
 }

src/main/java/ru/bclib/mixin/common/shears/TripWireBlockMixin.java

@@ -1,17 +1,22 @@
 package ru.bclib.mixin.common.shears;
 
-import net.minecraft.world.item.Item;
+import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.TripWireBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import ru.bclib.items.tool.BaseShearsItem;
+import ru.bclib.util.MethodReplace;
 
 @Mixin(TripWireBlock.class)
 public class TripWireBlockMixin {
-	@Redirect(method="playerWillDestroy", at=@At(value="INVOKE", target="Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z"))
+	@Inject(method = "playerWillDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)V", at = @At("HEAD"))
-	public boolean bn_useProxy(ItemStack itemStack, Item item){
+	private void bclib_isShears(Level level, BlockPos blockPos, BlockState blockState, Player player, CallbackInfo info) {
-		return BaseShearsItem.isShear(itemStack, item);
+		MethodReplace.addItemReplace(Items.SHEARS, BaseShearsItem::isShear);
 	}
 }

src/main/java/ru/bclib/recipes/AnvilRecipe.java

@@ -4,15 +4,12 @@ import com.google.gson.JsonObject;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.minecraft.core.NonNullList;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.Container;

src/main/java/ru/bclib/recipes/GridRecipe.java

@@ -3,7 +3,6 @@ package ru.bclib.recipes;
 import com.google.common.collect.Maps;
 import net.minecraft.core.NonNullList;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;

src/main/java/ru/bclib/recipes/SmithingTableRecipe.java

@@ -1,7 +1,6 @@
 package ru.bclib.recipes;
 
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;

src/main/java/ru/bclib/util/MethodReplace.java

@@ -0,0 +1,46 @@
+package ru.bclib.util;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+
+public class MethodReplace {
+	private static Function<ItemStack, Boolean> itemReplace;
+	private static Function<BlockStateBase, Boolean> blockReplace;
+	private static Block block;
+	private static Item item;
+	
+	public static void addItemReplace(Item item, Function<ItemStack, Boolean> itemReplace) {
+		MethodReplace.itemReplace = itemReplace;
+		MethodReplace.item = item;
+	}
+	
+	public static void addBlockReplace(Block block, Function<BlockStateBase, Boolean> blockReplace) {
+		MethodReplace.blockReplace = blockReplace;
+		MethodReplace.block = block;
+	}
+	
+	@Nullable
+	public static Function<ItemStack, Boolean> getItemReplace(Item item) {
+		if (MethodReplace.item != item) {
+			return null;
+		}
+		Function<ItemStack, Boolean> replace = itemReplace;
+		itemReplace = null;
+		return replace;
+	}
+	
+	@Nullable
+	public static Function<BlockStateBase, Boolean> getBlockReplace(Block block) {
+		if (MethodReplace.block != block) {
+			return null;
+		}
+		Function<BlockStateBase, Boolean> replace = blockReplace;
+		blockReplace = null;
+		return replace;
+	}
+}

src/main/java/ru/bclib/world/biomes/BCLBiome.java

@@ -1,6 +1,5 @@
 package ru.bclib.world.biomes;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import net.minecraft.core.Holder;
@@ -10,11 +9,8 @@ import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
 import net.minecraft.world.level.levelgen.SurfaceRules;
 import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource;
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.BCLib;
 import ru.bclib.api.biomes.BiomeAPI;

src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java

@@ -1,13 +1,10 @@
 package ru.bclib.world.generator;
 
-import com.mojang.datafixers.kinds.Applicative;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.RegistryOps;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biome.BiomeCategory;

src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java

@@ -5,7 +5,6 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.RegistryOps;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biome.BiomeCategory;

src/main/resources/bclib.accesswidener

@@ -8,4 +8,4 @@ accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$Condition
 accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$SurfaceRule
 accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$LazyXZCondition
 accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$LazyCondition
-accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource
+accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource

src/main/resources/bclib.mixins.client.json

@@ -4,7 +4,6 @@
 	"package": "ru.bclib.mixin.client",
 	"compatibilityLevel": "JAVA_17",
 	"client": [
-		"EnchantingTableBlockMixin",
 		"ClientRecipeBookMixin",
 		"ModelManagerMixin",
 		"TextureAtlasMixin",

src/main/resources/bclib.mixins.common.json

@@ -11,22 +11,26 @@
 		"NoiseBasedChunkGeneratorMixin",
 		"NoiseGeneratorSettingsMixin",
 		"SurfaceRulesContextAccessor",
+		"EnchantingTableBlockMixin",
 		"shears.TripWireBlockMixin",
+		"StructureFeaturesAccessor",
 		"MobSpawnSettingsAccessor",
+		"StructureFeatureAccessor",
 		"shears.BeehiveBlockMixin",
 		"shears.PumpkinBlockMixin",
 		"shears.MushroomCowMixin",
 		"ComposterBlockAccessor",
 		"PotionBrewingAccessor",
 		"RecipeManagerAccessor",
-		"DiggerItemAccessor",
 		"shears.SnowGolemMixin",
 		"MinecraftServerMixin",
 		"NetherBiomeDataMixin",
 		"PistonBaseBlockMixin",
 		"TheEndBiomeDataMixin",
+		"BlockStateBaseMixin",
 		"ChunkGeneratorMixin",
 		"WorldGenRegionMixin",
+		"DiggerItemAccessor",
 		"DimensionTypeMixin",
 		"RecipeManagerMixin",
 		"RecipeManagerMixin",
@@ -39,11 +43,10 @@
 		"BiomeSourceMixin",
 		"AnvilBlockMixin",
 		"AnvilMenuMixin",
+		"ItemStackMixin",
 		"TagLoaderMixin",
-		"MainMixin",
 		"BiomeAccessor",
-		"StructureFeatureAccessor",
+		"MainMixin"
-		"StructureFeaturesAccessor"
 	],
 	"injectors": {
 		"defaultRequire": 1