Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java

src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java

@@ -2,7 +2,7 @@ package carpet.mixins;
 
 import carpet.CarpetServer;
 import carpet.script.ExpressionInspector;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.decoration.ArmorStandEntity;

src/main/java/carpet/mixins/ChunkGeneratorMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.feature.FeatureConfig;

src/main/java/carpet/mixins/ChunkMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.Chunk;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/carpet/mixins/CloneCommandMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Block;
 import net.minecraft.server.command.CloneCommand;
 import net.minecraft.server.world.ServerWorld;

src/main/java/carpet/mixins/CommandManagerMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
 import carpet.CarpetServer;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;

src/main/java/carpet/mixins/ContainerMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.container.Container;
 import net.minecraft.container.Slot;
 import net.minecraft.container.SlotActionType;

src/main/java/carpet/mixins/CoralBlockMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.CoralFeatureInterface;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -20,7 +20,6 @@ import net.minecraft.world.gen.feature.CoralFeature;
 import net.minecraft.world.gen.feature.CoralMushroomFeature;
 import net.minecraft.world.gen.feature.CoralTreeFeature;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
-import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.util.Random;

src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import com.google.common.collect.Lists;
 import com.mojang.datafixers.Dynamic;
 import net.minecraft.entity.EntityType;

src/main/java/carpet/mixins/DirectionMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.EntityInterface;
 import carpet.helpers.BlockRotator;
 import net.minecraft.entity.Entity;

src/main/java/carpet/mixins/DispenserBlock_qcMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

src/main/java/carpet/mixins/EndCityFeatureMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import com.google.common.collect.Lists;
 import com.mojang.datafixers.Dynamic;
 import net.minecraft.entity.EntityType;

src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.client.network.packet.EntityAttachS2CPacket;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.MobEntity;

src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;

src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.ExperienceOrbInterface;
 import carpet.helpers.XPcombine;
 import net.minecraft.entity.ExperienceOrbEntity;

src/main/java/carpet/mixins/ExplosionMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
 import carpet.helpers.OptimizedExplosion;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.explosion.Explosion;
 import org.spongepowered.asm.mixin.Final;

src/main/java/carpet/mixins/FillCommandMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Block;
 import net.minecraft.server.command.FillCommand;
 import net.minecraft.server.world.ServerWorld;

src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.EntityCategory;
 import net.minecraft.util.math.BlockPos;

src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.EntityCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;

src/main/java/carpet/mixins/GuardianEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.EntityData;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LightningEntity;

src/main/java/carpet/mixins/HopperBlockEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.HopperBlock;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.HopperBlockEntity;

src/main/java/carpet/mixins/HuskEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.mob.HuskEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;

src/main/java/carpet/mixins/InfestedBlockMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;

src/main/java/carpet/mixins/ItemEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.helpers.InventoryHelper;
 import carpet.fakes.ItemEntityInterface;
 import net.minecraft.block.ShulkerBoxBlock;

src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;

src/main/java/carpet/mixins/MinecraftClientMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
 import carpet.CarpetServer;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

src/main/java/carpet/mixins/OverworldChunkGeneratorMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.EntityCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;

src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
 import net.minecraft.item.PickaxeItem;

src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.PistonBlockEntityInterface;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.PistonBlockEntity;

src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.PistonBlockEntityInterface;
 import carpet.fakes.WorldInterface;
 import net.minecraft.block.Block;

src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.PistonBlockEntityInterface;
 import com.google.common.collect.Lists;
 import net.minecraft.block.*;

src/main/java/carpet/mixins/PistonBlock_qcMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.PistonBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;

src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;

src/main/java/carpet/mixins/PistonHandler_pushLimitMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.piston.PistonHandler;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;

src/main/java/carpet/mixins/PlayerEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.helpers.PortalHelper;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;

src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.pattern.BlockPattern;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.network.ServerPlayNetworkHandler;

src/main/java/carpet/mixins/PoweredRailBlock_powerLimitMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.PoweredRailBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;

src/main/java/carpet/mixins/RedstoneWireBlockMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.RedstoneWireBlockInterface;
 import carpet.helpers.RedstoneWireTurbo;
 import net.minecraft.block.Block;

src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
 import carpet.helpers.TickSpeed;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.client.render.RenderTickCounter;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/carpet/mixins/SaplingBlockMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
+import carpet.CarpetSettings;
 import carpet.helpers.BlockSaplingHelper;
-import carpet.settings.CarpetSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.SaplingBlock;

src/main/java/carpet/mixins/ServerMetadata_motdMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.server.ServerMetadata;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;

src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;

src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import org.spongepowered.asm.mixin.Final;

src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.world.ServerWorld;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/carpet/mixins/SetBlockCommandMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Block;
 import net.minecraft.server.command.SetBlockCommand;
 import net.minecraft.server.world.ServerWorld;

src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
 import net.minecraft.item.ItemStack;
@@ -8,7 +8,6 @@ import net.minecraft.item.ShearsItem;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ShearsItem.class)

src/main/java/carpet/mixins/SpawnHelperMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
+import carpet.CarpetSettings;
 import carpet.fakes.WorldInterface;
-import carpet.settings.CarpetSettings;
 import carpet.utils.SpawnReporter;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;

src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.entity.StructureBlockBlockEntity;
 import net.minecraft.structure.Structure;
 import net.minecraft.structure.StructurePlacementData;

src/main/java/carpet/mixins/StructureFeatureMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.StructureFeatureInterface;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructureStart;

src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.Block;
 import net.minecraft.structure.Structure;
 import net.minecraft.structure.StructurePlacementData;

src/main/java/carpet/mixins/SummonCommandMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LightningEntity;
 import net.minecraft.entity.mob.SkeletonHorseEntity;

src/main/java/carpet/mixins/TntBlockMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.TntBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

src/main/java/carpet/mixins/TntEntityMixin.java

@@ -1,7 +1,7 @@
 package carpet.mixins;
 
 import carpet.fakes.TntEntityInterface;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;

src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.fakes.WorldChunkInterface;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;

src/main/java/carpet/mixins/World_fillUpdatesMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;