Buckets & entity enhancements, cleanup

src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java

@@ -5,7 +5,6 @@ import java.util.List;
 import com.google.common.collect.Lists;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.fabricmc.fabric.api.tag.TagRegistry;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;

src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;

src/main/java/ru/betterend/blocks/BoluxMushroomBlock.java

@@ -2,6 +2,9 @@ package ru.betterend.blocks;
 
 import java.util.List;
 import java.util.Random;
+
+import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
@@ -12,7 +15,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import com.google.common.collect.Lists;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 

src/main/java/ru/betterend/blocks/BulbVineBlock.java

@@ -1,13 +1,15 @@
 package ru.betterend.blocks;
 
 import java.util.List;
+
+import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import com.google.common.collect.Lists;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.VineBlock;
 import ru.betterend.registry.EndBlocks;

src/main/java/ru/betterend/blocks/BulbVineSeedBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.LevelReader;

src/main/java/ru/betterend/blocks/CavePumpkinVineBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;

src/main/java/ru/betterend/blocks/EndLilySeedBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.material.Fluids;

src/main/java/ru/betterend/blocks/EndLotusSeedBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;

src/main/java/ru/betterend/blocks/EndPedestal.java

@@ -2,6 +2,7 @@ package ru.betterend.blocks;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;

src/main/java/ru/betterend/blocks/EternalPedestal.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
 import java.util.List;
+
+import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
@@ -19,7 +22,6 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import com.google.common.collect.Lists;
 import ru.betterend.blocks.basis.PedestalBlock;
 import ru.betterend.blocks.entities.EternalPedestalEntity;
 import ru.betterend.registry.EndBlocks;

src/main/java/ru/betterend/blocks/EternalRunedFlavolite.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
 import java.util.List;
+
+import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -9,7 +12,6 @@ import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import com.google.common.collect.Lists;
 
 public class EternalRunedFlavolite extends RunedFlavolite {
 

src/main/java/ru/betterend/blocks/HydraluxSaplingBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.world.level.WorldGenLevel;

src/main/java/ru/betterend/blocks/LanceleafBlock.java

@@ -2,6 +2,7 @@ package ru.betterend.blocks;
 
 import java.util.Collections;
 import java.util.List;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.ItemStack;

src/main/java/ru/betterend/blocks/LanceleafSeedBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;

src/main/java/ru/betterend/blocks/LumecornSeedBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockBehaviour;

src/main/java/ru/betterend/blocks/PedestalVanilla.java

@@ -2,6 +2,7 @@ package ru.betterend.blocks;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;

src/main/java/ru/betterend/blocks/SmallAmaranitaBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.BlockGetter;

src/main/java/ru/betterend/blocks/TwistedUmbrellaMossTallBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.item.ItemEntity;

src/main/java/ru/betterend/blocks/UmbrellaMossTallBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks;
 
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.item.ItemEntity;

src/main/java/ru/betterend/blocks/basis/BarkBlock.java

@@ -1,6 +1,7 @@
 package ru.betterend.blocks.basis;
 
 import java.io.Reader;
+
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import ru.betterend.patterns.Patterns;

src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java

@@ -2,6 +2,7 @@ package ru.betterend.blocks.basis;
 
 import java.util.Collections;
 import java.util.List;
+
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.BaseEntityBlock;

src/main/java/ru/betterend/blocks/basis/BlockBase.java

@@ -3,6 +3,7 @@ package ru.betterend.blocks.basis;
 import java.io.Reader;
 import java.util.Collections;
 import java.util.List;
+
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;

src/main/java/ru/betterend/blocks/basis/TripleTerrainBlock.java

@@ -2,6 +2,9 @@ package ru.betterend.blocks.basis;
 
 import java.util.Map;
 import java.util.Random;
+
+import com.google.common.collect.Maps;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
@@ -20,7 +23,6 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.phys.BlockHitResult;
-import com.google.common.collect.Maps;
 import ru.betterend.blocks.BlockProperties;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.EndTerrainBlock;

src/main/java/ru/betterend/blocks/entities/render/EndChestBlockEntityRenderer.java

@@ -1,6 +1,14 @@
 package ru.betterend.blocks.entities.render;
 
 import java.util.HashMap;
+
+import com.google.common.collect.Maps;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Vector3f;
+
+import it.unimi.dsi.fastutil.floats.Float2FloatFunction;
+import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
@@ -22,12 +30,6 @@ import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.entity.LidBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.ChestType;
-import com.google.common.collect.Maps;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
-import it.unimi.dsi.fastutil.floats.Float2FloatFunction;
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.basis.EndChestBlock;
 import ru.betterend.blocks.entities.EChestBlockEntity;

src/main/java/ru/betterend/blocks/entities/render/EndSignBlockEntityRenderer.java

@@ -2,6 +2,13 @@ package ru.betterend.blocks.entities.render;
 
 import java.util.HashMap;
 import java.util.List;
+
+import com.google.common.collect.Maps;
+import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Vector3f;
+
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
@@ -20,11 +27,6 @@ import net.minecraft.world.level.block.SignBlock;
 import net.minecraft.world.level.block.StandingSignBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WoodType;
-import com.google.common.collect.Maps;
-import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Vector3f;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.basis.EndSignBlock;
 import ru.betterend.blocks.entities.ESignBlockEntity;

src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java

@@ -2,6 +2,7 @@ package ru.betterend.blocks.entities.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;

src/main/java/ru/betterend/client/gui/BlockSignEditScreen.java

@@ -12,6 +12,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.Util;

src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java

@@ -6,6 +6,7 @@ import java.util.Set;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.GuiComponent;

src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java

@@ -2,6 +2,7 @@ package ru.betterend.client.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.components.ImageButton;

src/main/java/ru/betterend/client/render/BeamRenderer.java

@@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix3f;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector3f;
+
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;

src/main/java/ru/betterend/client/render/EndCrystalRenderer.java

@@ -6,6 +6,7 @@ import com.mojang.math.Matrix3f;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
+
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;

src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java

@@ -3,6 +3,7 @@ package ru.betterend.client.render;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
+
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;

src/main/java/ru/betterend/config/ConfigKeeper.java

@@ -4,13 +4,15 @@ import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import net.minecraft.util.GsonHelper;
+
 import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Maps;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+
+import net.minecraft.util.GsonHelper;
 import ru.betterend.util.JsonFactory;
 
 public final class ConfigKeeper {

src/main/java/ru/betterend/config/IdConfig.java

@@ -1,8 +1,10 @@
 package ru.betterend.config;
 
 import java.util.function.BiFunction;
-import net.minecraft.resources.ResourceLocation;
+
 import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.resources.ResourceLocation;
 import ru.betterend.config.ConfigKeeper.Entry;
 import ru.betterend.config.ConfigKeeper.FloatRange;
 import ru.betterend.config.ConfigKeeper.IntegerRange;

src/main/java/ru/betterend/entity/CubozoaEntity.java

@@ -2,6 +2,7 @@ package ru.betterend.entity;
 
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -30,7 +31,6 @@ import net.minecraft.world.entity.animal.AbstractSchoolingFish;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.phys.AABB;
@@ -49,7 +49,13 @@ public class CubozoaEntity extends AbstractSchoolingFish {
 	@Override
 	public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, SpawnGroupData entityData, CompoundTag entityTag) {
 		SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag);
-		if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
+		if (entityTag != null) {
+			if (entityTag.contains("variant"))
+				this.entityData.set(VARIANT, entityTag.getByte("variant"));
+			if (entityTag.contains("scale"))
+				this.entityData.set(SCALE, entityTag.getByte("scale"));
+		}
+		else if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
 			this.entityData.set(VARIANT, (byte) 1);
 		}
 		this.refreshDimensions();
@@ -67,7 +73,7 @@ public class CubozoaEntity extends AbstractSchoolingFish {
 	public void addAdditionalSaveData(CompoundTag tag) {
 		super.addAdditionalSaveData(tag);
 		tag.putByte("Variant", (byte) getVariant());
-		tag.putByte("Scale", (byte) getScale());
+		tag.putByte("Scale", getByteScale());
 	}
 
 	@Override
@@ -81,6 +87,15 @@ public class CubozoaEntity extends AbstractSchoolingFish {
 		}
 	}
 	
+	@Override
+	protected ItemStack getBucketItemStack() {
+		ItemStack bucket = EndItems.BUCKET_CUBOZOA.getDefaultInstance();
+		CompoundTag tag = bucket.getOrCreateTag();
+		tag.putByte("variant", entityData.get(VARIANT));
+		tag.putByte("scale", entityData.get(SCALE));
+		return bucket;
+	}
+
 	public static AttributeSupplier.Builder createMobAttributes() {
 		return LivingEntity.createLivingAttributes()
 				.add(Attributes.MAX_HEALTH, 2.0)
@@ -92,8 +107,12 @@ public class CubozoaEntity extends AbstractSchoolingFish {
 		return (int) this.entityData.get(VARIANT);
 	}
 	
+	public byte getByteScale() {
+		return this.entityData.get(SCALE);
+	}
+
 	public float getScale() {
-		return this.entityData.get(SCALE) / 32F + 0.75F;
+		return getByteScale() / 32F + 0.75F;
 	}
 
 	public static boolean canSpawn(EntityType<CubozoaEntity> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
@@ -117,11 +136,6 @@ public class CubozoaEntity extends AbstractSchoolingFish {
 		}
 	}
 
-	@Override
-	protected ItemStack getBucketItemStack() {
-		return new ItemStack(Items.WATER_BUCKET);
-	}
-
 	@Override
 	protected SoundEvent getFlopSound() {
 		return SoundEvents.SALMON_FLOP;

src/main/java/ru/betterend/entity/DragonflyEntity.java

@@ -2,6 +2,7 @@ package ru.betterend.entity;
 
 import java.util.EnumSet;
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
@@ -31,8 +32,6 @@ import net.minecraft.world.level.levelgen.Heightmap.Types;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.phys.Vec3;
-import ru.betterend.entity.DragonflyEntity.DragonflyLookControl;
-import ru.betterend.entity.DragonflyEntity.WanderAroundGoal;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndSounds;
 import ru.betterend.util.BlocksHelper;

src/main/java/ru/betterend/entity/EndFishEntity.java

@@ -2,6 +2,7 @@ package ru.betterend.entity;
 
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
@@ -42,7 +43,13 @@ public class EndFishEntity extends AbstractSchoolingFish {
 	@Override
 	public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, SpawnGroupData entityData, CompoundTag entityTag) {
 		SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag);
-		if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
+		if (entityTag != null) {
+			if (entityTag.contains("variant"))
+				this.entityData.set(VARIANT, entityTag.getByte("variant"));
+			if (entityTag.contains("scale"))
+				this.entityData.set(SCALE, entityTag.getByte("scale"));
+		}
+		else if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
 			this.entityData.set(VARIANT, (byte) (random.nextInt(VARIANTS_SULPHUR) + VARIANTS_NORMAL));
 		}
 		this.refreshDimensions();
@@ -60,7 +67,7 @@ public class EndFishEntity extends AbstractSchoolingFish {
 	public void addAdditionalSaveData(CompoundTag tag) {
 		super.addAdditionalSaveData(tag);
 		tag.putByte("Variant", (byte) getVariant());
-		tag.putByte("Scale", (byte) getScale());
+		tag.putByte("Scale", getByteScale());
 	}
 
 	@Override
@@ -76,7 +83,11 @@ public class EndFishEntity extends AbstractSchoolingFish {
 
 	@Override
 	protected ItemStack getBucketItemStack() {
-		return new ItemStack(EndItems.BUCKET_END_FISH);
+		ItemStack bucket = EndItems.BUCKET_END_FISH.getDefaultInstance();
+		CompoundTag tag = bucket.getOrCreateTag();
+		tag.putByte("variant", entityData.get(VARIANT));
+		tag.putByte("scale", entityData.get(SCALE));
+		return bucket;
 	}
 
 	@Override
@@ -121,8 +132,12 @@ public class EndFishEntity extends AbstractSchoolingFish {
 		return (int) this.entityData.get(VARIANT);
 	}
 	
+	public byte getByteScale() {
+		return this.entityData.get(SCALE);
+	}
+	
 	public float getScale() {
-		return this.entityData.get(SCALE) / 32F + 0.75F;
+		return getByteScale() / 32F + 0.75F;
 	}
 	
 	public static boolean canSpawn(EntityType<EndFishEntity> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {

src/main/java/ru/betterend/entity/EndSlimeEntity.java

@@ -3,6 +3,7 @@ package ru.betterend.entity;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.particles.ParticleOptions;
@@ -37,11 +38,6 @@ import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.phys.AABB;
-import ru.betterend.entity.EndSlimeEntity.EndSlimeMoveControl;
-import ru.betterend.entity.EndSlimeEntity.FaceTowardTargetGoal;
-import ru.betterend.entity.EndSlimeEntity.MoveGoal;
-import ru.betterend.entity.EndSlimeEntity.RandomLookGoal;
-import ru.betterend.entity.EndSlimeEntity.SwimmingGoal;
 import ru.betterend.interfaces.ISlime;
 import ru.betterend.registry.EndBiomes;
 import ru.betterend.util.BlocksHelper;

src/main/java/ru/betterend/entity/ShadowWalkerEntity.java

@@ -2,6 +2,7 @@ package ru.betterend.entity;
 
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvent;

src/main/java/ru/betterend/entity/SilkMothEntity.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Random;
 
 import org.jetbrains.annotations.Nullable;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
@@ -46,9 +47,6 @@ import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.BlockProperties;
-import ru.betterend.entity.SilkMothEntity.MothLookControl;
-import ru.betterend.entity.SilkMothEntity.ReturnToHiveGoal;
-import ru.betterend.entity.SilkMothEntity.WanderAroundGoal;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;

src/main/java/ru/betterend/entity/model/BlockBenchModel.java

@@ -1,6 +1,7 @@
 package ru.betterend.entity.model;
 
 import java.util.function.Function;
+
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;

src/main/java/ru/betterend/entity/model/CubozoaEntityModel.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.model;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.util.Mth;

src/main/java/ru/betterend/entity/model/DragonflyEntityModel.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.model;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import ru.betterend.entity.DragonflyEntity;

src/main/java/ru/betterend/entity/model/EndFishEntityModel.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.model;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import ru.betterend.entity.EndFishEntity;

src/main/java/ru/betterend/entity/model/EndSlimeEntityModel.java

@@ -3,6 +3,7 @@ package ru.betterend.entity.model;
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.model.ListModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;

src/main/java/ru/betterend/entity/model/SilkMothEntityModel.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.model;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.util.Mth;

src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;

src/main/java/ru/betterend/entity/render/RendererEntityEndFish.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;

src/main/java/ru/betterend/entity/render/RendererEntityEndSlime.java

@@ -2,6 +2,7 @@ package ru.betterend.entity.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;

src/main/java/ru/betterend/integration/FlamboyantRefabricatedIntegration.java

@@ -2,8 +2,10 @@ package ru.betterend.integration;
 
 import java.awt.Color;
 import java.util.Map;
-import net.minecraft.world.level.ItemLike;
+
 import com.google.common.collect.Maps;
+
+import net.minecraft.world.level.ItemLike;
 import ru.betterend.blocks.HydraluxPetalColoredBlock;
 import ru.betterend.blocks.complex.ColoredMaterial;
 import ru.betterend.registry.EndBlocks;

src/main/java/ru/betterend/integration/byg/BYGIntegration.java

@@ -2,6 +2,7 @@ package ru.betterend.integration.byg;
 
 import java.util.List;
 import java.util.stream.Collectors;
+
 import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.ai.behavior.WeightedList;

src/main/java/ru/betterend/integration/byg/biomes/EterialGrove.java

@@ -1,6 +1,7 @@
 package ru.betterend.integration.byg.biomes;
 
 import java.util.List;
+
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.biome.Biome;

src/main/java/ru/betterend/integration/byg/biomes/NightshadeRedwoods.java

@@ -1,6 +1,7 @@
 package ru.betterend.integration.byg.biomes;
 
 import java.util.List;
+
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.MobCategory;

src/main/java/ru/betterend/integration/byg/biomes/OldBulbisGardens.java

@@ -2,6 +2,7 @@ package ru.betterend.integration.byg.biomes;
 
 import java.util.List;
 import java.util.function.Supplier;
+
 import net.minecraft.core.Registry;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.data.BuiltinRegistries;

src/main/java/ru/betterend/integration/byg/features/BigEtherTreeFeature.java

@@ -2,14 +2,16 @@ package ru.betterend.integration.byg.features;
 
 import java.util.List;
 import java.util.Random;
+
+import com.google.common.base.Function;
+import com.mojang.math.Vector3f;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
-import com.google.common.base.Function;
-import com.mojang.math.Vector3f;
 import ru.betterend.integration.Integrations;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.MHelper;

src/main/java/ru/betterend/integration/byg/features/GreatNightshadeTreeFeature.java

@@ -2,6 +2,11 @@ package ru.betterend.integration.byg.features;
 
 import java.util.List;
 import java.util.Random;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.mojang.math.Vector3f;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -12,9 +17,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-import com.mojang.math.Vector3f;
 import ru.betterend.integration.Integrations;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;

src/main/java/ru/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java

@@ -2,6 +2,11 @@ package ru.betterend.integration.byg.features;
 
 import java.util.List;
 import java.util.Random;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.mojang.math.Vector3f;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -12,9 +17,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-import com.mojang.math.Vector3f;
 import ru.betterend.integration.Integrations;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;

src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java

@@ -3,6 +3,10 @@ package ru.betterend.integration.byg.features;
 import java.util.List;
 import java.util.Random;
 import java.util.function.Function;
+
+import com.google.common.collect.Lists;
+import com.mojang.math.Vector3f;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.WorldGenLevel;
@@ -12,8 +16,6 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.AABB;
-import com.google.common.collect.Lists;
-import com.mojang.math.Vector3f;
 import ru.betterend.integration.Integrations;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndTags;

src/main/java/ru/betterend/integration/rei/REIAlloyingCategory.java

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import it.unimi.dsi.fastutil.ints.IntList;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;

src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.EntryStack;

src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import it.unimi.dsi.fastutil.ints.IntList;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;

src/main/java/ru/betterend/integration/rei/REIInfusionCategory.java

@@ -6,6 +6,7 @@ import org.jetbrains.annotations.NotNull;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import it.unimi.dsi.fastutil.ints.IntList;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;

src/main/java/ru/betterend/interfaces/IBiomeList.java

@@ -1,6 +1,7 @@
 package ru.betterend.interfaces;
 
 import java.util.List;
+
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
 

src/main/java/ru/betterend/item/EndArmorItem.java

@@ -1,6 +1,10 @@
 package ru.betterend.item;
 
 import java.util.UUID;
+
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.Multimap;
+
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
@@ -8,8 +12,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
 import net.minecraft.world.item.Item;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
 import ru.betterend.mixin.common.ArmorItemAccessor;
 import ru.betterend.patterns.Patterned;
 import ru.betterend.patterns.Patterns;

src/main/java/ru/betterend/item/EndBucketItem.java

@@ -0,0 +1,18 @@
+package ru.betterend.item;
+
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.level.material.Fluids;
+import ru.betterend.patterns.Patterned;
+import ru.betterend.patterns.Patterns;
+import ru.betterend.registry.EndItems;
+
+public class EndBucketItem extends BucketItem implements Patterned {
+	public EndBucketItem() {
+		super(Fluids.WATER, EndItems.makeItemSettings().stacksTo(1));
+	}
+
+	@Override
+	public String getModelPattern(String name) {
+		return Patterns.createJson(Patterns.ITEM_GENERATED, name);
+	}
+}

src/main/java/ru/betterend/item/GuideBookItem.java

@@ -1,6 +1,7 @@
 package ru.betterend.item;
 
 import java.util.List;
+
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;

src/main/java/ru/betterend/item/material/EndToolMaterial.java

@@ -1,6 +1,7 @@
 package ru.betterend.item.material;
 
 import java.util.function.Supplier;
+
 import net.minecraft.util.LazyLoadedValue;
 import net.minecraft.world.item.Tier;
 import net.minecraft.world.item.crafting.Ingredient;

src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java

@@ -1,11 +1,13 @@
 package ru.betterend.item.model;
 
 import java.util.Collections;
+
+import com.google.common.collect.Lists;
+
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.entity.LivingEntity;
-import com.google.common.collect.Lists;
 
 public class CrystaliteBootsModel extends HumanoidModel<LivingEntity> {
 

src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java

@@ -1,13 +1,15 @@
 package ru.betterend.item.model;
 
 import java.util.Collections;
+
+import com.google.common.collect.Lists;
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.entity.LivingEntity;
-import com.google.common.collect.Lists;
-import com.mojang.blaze3d.vertex.PoseStack;
 
 public class CrystaliteChestplateModel extends HumanoidModel<LivingEntity> {
 

src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java

@@ -1,11 +1,13 @@
 package ru.betterend.item.model;
 
 import java.util.Collections;
+
+import com.google.common.collect.Lists;
+
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.entity.LivingEntity;
-import com.google.common.collect.Lists;
 
 public class CrystaliteLeggingsModel extends HumanoidModel<LivingEntity> {
 

src/main/java/ru/betterend/mixin/client/AbstractSoundInstanceAccessor.java

@@ -1,9 +1,10 @@
 package ru.betterend.mixin.client;
 
-import net.minecraft.client.resources.sounds.AbstractSoundInstance;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+import net.minecraft.client.resources.sounds.AbstractSoundInstance;
+
 @Mixin(AbstractSoundInstance.class)
 public interface AbstractSoundInstanceAccessor {
 	@Accessor("volume")

src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java

@@ -1,6 +1,16 @@
 package ru.betterend.mixin.client;
 
 import java.util.List;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.google.common.collect.Lists;
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
@@ -13,14 +23,6 @@ import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.AnvilMenu;
 import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import com.google.common.collect.Lists;
-import com.mojang.blaze3d.vertex.PoseStack;
 import ru.betterend.interfaces.AnvilScreenHandlerExtended;
 
 @Mixin(AnvilScreen.class)

src/main/java/ru/betterend/mixin/client/BackgroundRendererMixin.java

@@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import net.minecraft.Util;
 import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java

@@ -1,16 +1,17 @@
 package ru.betterend.mixin.client;
 
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.protocol.PacketUtils;
 import net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import ru.betterend.blocks.entities.ESignBlockEntity;
 import ru.betterend.client.gui.BlockSignEditScreen;
 

src/main/java/ru/betterend/mixin/client/ClientRecipeBookMixin.java

@@ -1,14 +1,14 @@
 package ru.betterend.mixin.client;
 
-import net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.world.item.crafting.Recipe;
 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 net.minecraft.client.ClientRecipeBook;
+import net.minecraft.client.RecipeBookCategories;
+import net.minecraft.world.item.crafting.Recipe;
 import ru.betterend.interfaces.BetterEndRecipe;
-import ru.betterend.recipe.builders.AlloyingRecipe;
 
 @Mixin(ClientRecipeBook.class)
 public abstract class ClientRecipeBookMixin {

src/main/java/ru/betterend/mixin/client/ContextGsonAccessor.java

@@ -4,6 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import com.google.gson.Gson;
+
 import net.minecraft.client.renderer.block.model.BlockModelDefinition;
 
 @Mixin(BlockModelDefinition.Context.class)

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

@@ -1,16 +1,18 @@
 package ru.betterend.mixin.client;
 
 import java.util.Random;
+
+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.CallbackInfo;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 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.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import ru.betterend.registry.EndTags;
 
 @Mixin(EnchantmentTableBlock.class)

src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java

@@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.item.ItemColors;

src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java

@@ -4,6 +4,15 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.core.Registry;
@@ -12,13 +21,6 @@ import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.BetterEnd;
 import ru.betterend.patterns.Patterned;
 import ru.betterend.world.generator.GeneratorOptions;

src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java

@@ -2,15 +2,17 @@ package ru.betterend.mixin.client;
 
 import java.io.Reader;
 import java.io.StringReader;
-import net.minecraft.client.renderer.block.model.BlockModelDefinition;
+
-import net.minecraft.util.GsonHelper;
-import net.minecraft.world.level.block.Block;
 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 com.google.gson.Gson;
+
+import net.minecraft.client.renderer.block.model.BlockModelDefinition;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.level.block.Block;
 import ru.betterend.patterns.BlockPatterned;
 
 @Mixin(BlockModelDefinition.class)

src/main/java/ru/betterend/mixin/client/MusicTrackerMixin.java

@@ -1,6 +1,14 @@
 package ru.betterend.mixin.client;
 
 import java.util.Random;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.sounds.AbstractSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
@@ -8,12 +16,6 @@ import net.minecraft.client.sounds.MusicManager;
 import net.minecraft.sounds.Music;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import ru.betterend.client.ClientOptions;
 
 @Mixin(MusicManager.class)

src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java

@@ -1,11 +1,7 @@
 package ru.betterend.mixin.client;
 
 import java.util.List;
-import net.minecraft.core.Registry;
+
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.FallbackResourceManager;
-import net.minecraft.server.packs.resources.Resource;
-import net.minecraft.world.level.block.Block;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,6 +10,12 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.google.common.collect.Lists;
+
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.FallbackResourceManager;
+import net.minecraft.server.packs.resources.Resource;
+import net.minecraft.world.level.block.Block;
 import ru.betterend.BetterEnd;
 import ru.betterend.patterns.BlockPatterned;
 

src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java

@@ -19,6 +19,7 @@ import com.mojang.blaze3d.vertex.VertexBuffer;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
+
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/ru/betterend/mixin/common/AnvilBlockMixin.java

@@ -1,12 +1,13 @@
 package ru.betterend.mixin.common;
 
-import net.minecraft.world.level.block.AnvilBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.IntegerProperty;
 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 net.minecraft.world.level.block.AnvilBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import ru.betterend.blocks.basis.EndAnvilBlock;
 
 @Mixin(AnvilBlock.class)

src/main/java/ru/betterend/mixin/common/AnvilMenuMixin.java

@@ -3,6 +3,14 @@ package ru.betterend.mixin.common;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -16,12 +24,6 @@ import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.world.level.block.AnvilBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.blocks.basis.EndAnvilBlock;
 import ru.betterend.interfaces.AnvilScreenHandlerExtended;
 import ru.betterend.recipe.builders.AnvilRecipe;

src/main/java/ru/betterend/mixin/common/ArmorItemAccessor.java

@@ -1,14 +1,16 @@
 package ru.betterend.mixin.common;
 
 import java.util.UUID;
-import net.minecraft.world.entity.ai.attributes.Attribute;
+
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import net.minecraft.world.item.ArmorItem;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import com.google.common.collect.Multimap;
 
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.item.ArmorItem;
+
 @Mixin(ArmorItem.class)
 public interface ArmorItemAccessor {
 	@Accessor("ARMOR_MODIFIER_UUID_PER_SLOT")

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

@@ -2,11 +2,13 @@ package ru.betterend.mixin.common;
 
 import java.util.List;
 import java.util.function.Supplier;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
 import net.minecraft.world.level.biome.BiomeGenerationSettings;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(BiomeGenerationSettings.class)
 public interface BiomeGenerationSettingsAccessor {

src/main/java/ru/betterend/mixin/common/BlockBehaviourMixin.java

@@ -1,6 +1,14 @@
 package ru.betterend.mixin.common;
 
 import java.util.List;
+
+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 com.google.common.collect.Lists;
+
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -11,12 +19,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-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 com.google.common.collect.Lists;
 import ru.betterend.item.tool.EndHammerItem;
 import ru.betterend.util.MHelper;
 

src/main/java/ru/betterend/mixin/common/BoneMealItemMixin.java

@@ -1,6 +1,12 @@
 package ru.betterend.mixin.common;
 
 import java.util.Random;
+
+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 net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -12,10 +18,6 @@ import net.minecraft.world.level.biome.Biome.BiomeCategory;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 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.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.registry.EndBiomes;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndTags;

src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java

@@ -1,6 +1,16 @@
 package ru.betterend.mixin.common;
 
 import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
@@ -16,14 +26,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;

src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java

@@ -1,5 +1,11 @@
 package ru.betterend.mixin.common;
 
+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.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -14,11 +20,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-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.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;

src/main/java/ru/betterend/mixin/common/ChorusPlantFeatureMixin.java

@@ -1,6 +1,12 @@
 package ru.betterend.mixin.common;
 
 import java.util.Random;
+
+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 net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Blocks;
@@ -10,10 +16,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.ChorusPlantFeature;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-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.betterend.registry.EndBlocks;
 import ru.betterend.util.BlocksHelper;
 import ru.betterend.util.MHelper;

src/main/java/ru/betterend/mixin/common/ChunkBiomeContainerMixin.java

@@ -1,12 +1,13 @@
 package ru.betterend.mixin.common;
 
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkBiomeContainer;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import ru.betterend.interfaces.IBiomeArray;
 
 @Mixin(ChunkBiomeContainer.class)

src/main/java/ru/betterend/mixin/common/ComposterBlockAccessor.java

@@ -1,9 +1,10 @@
 package ru.betterend.mixin.common;
 
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.ComposterBlock;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(ComposterBlock.class)
 public interface ComposterBlockAccessor {

src/main/java/ru/betterend/mixin/common/CraftingMenuMixin.java

@@ -1,9 +1,5 @@
 package ru.betterend.mixin.common;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.ContainerLevelAccess;
-import net.minecraft.world.inventory.CraftingMenu;
-import net.minecraft.world.level.block.CraftingTableBlock;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -11,6 +7,11 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.CraftingMenu;
+import net.minecraft.world.level.block.CraftingTableBlock;
+
 @Mixin(CraftingMenu.class)
 public abstract class CraftingMenuMixin {
 	@Final

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

@@ -1,15 +1,16 @@
 package ru.betterend.mixin.common;
 
+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 net.minecraft.core.Registry;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
-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.betterend.world.generator.BetterEndBiomeSource;
 import ru.betterend.world.generator.GeneratorOptions;
 

src/main/java/ru/betterend/mixin/common/EnchantmentMenuMixin.java

@@ -2,6 +2,14 @@ package ru.betterend.mixin.common;
 
 import java.util.List;
 import java.util.Random;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
 import net.minecraft.core.Registry;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -12,12 +20,6 @@ import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.EnchantmentInstance;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import ru.betterend.registry.EndTags;
 
 @Mixin(EnchantmentMenu.class)

src/main/java/ru/betterend/mixin/common/EndCityFeatureMixin.java

@@ -1,5 +1,11 @@
 package ru.betterend.mixin.common;
 
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeSource;
@@ -7,11 +13,6 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.levelgen.feature.EndCityFeature;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.world.generator.GeneratorOptions;
 
 @Mixin(EndCityFeature.class)

src/main/java/ru/betterend/mixin/common/EndPodiumFeatureMixin.java

@@ -1,6 +1,15 @@
 package ru.betterend.mixin.common;
 
 import java.util.Random;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.world.level.WorldGenLevel;
@@ -10,13 +19,6 @@ import net.minecraft.world.level.levelgen.feature.EndPodiumFeature;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.BetterEnd;
 import ru.betterend.util.StructureHelper;
 import ru.betterend.util.WorldDataUtil;

src/main/java/ru/betterend/mixin/common/EnderManMixin.java

@@ -1,13 +1,14 @@
 package ru.betterend.mixin.common;
 
+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 net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
-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.betterend.effects.EndEnchantments;
 import ru.betterend.effects.EndStatusEffects;