diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java index 06dfbd45..92a046e4 100644 --- a/src/main/java/carpet/CarpetServer.java +++ b/src/main/java/carpet/CarpetServer.java @@ -20,7 +20,6 @@ import carpet.commands.TickCommand; import carpet.helpers.TickSpeed; import carpet.logging.LoggerRegistry; import carpet.script.CarpetScriptServer; -import carpet.settings.CarpetSettings; import carpet.settings.SettingsManager; import carpet.utils.HUDController; import carpet.utils.MobAI; diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java similarity index 99% rename from src/main/java/carpet/settings/CarpetSettings.java rename to src/main/java/carpet/CarpetSettings.java index 4442c1cc..1135f9ad 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -1,6 +1,8 @@ -package carpet.settings; +package carpet; -import carpet.CarpetServer; +import carpet.settings.ParsedRule; +import carpet.settings.Rule; +import carpet.settings.Validator; import carpet.utils.Messenger; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; @@ -97,7 +99,8 @@ public class CarpetSettings @Rule( desc = "TNT causes less lag when exploding in the same spot and in liquids", category = TNT) public static boolean optimizedTNT = false; - private static class CheckOptimizedTntEnabledValidator extends Validator { + private static class CheckOptimizedTntEnabledValidator extends Validator + { @Override public T validate(ServerCommandSource source, ParsedRule currentRule, T newValue, String string) { return optimizedTNT || currentRule.defaultValue.equals(newValue) ? newValue : null; diff --git a/src/main/java/carpet/commands/CameraModeCommand.java b/src/main/java/carpet/commands/CameraModeCommand.java index 02ee96f9..4df774bf 100644 --- a/src/main/java/carpet/commands/CameraModeCommand.java +++ b/src/main/java/carpet/commands/CameraModeCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.settings.SettingsManager; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/src/main/java/carpet/commands/CounterCommand.java b/src/main/java/carpet/commands/CounterCommand.java index 9fd73aaf..4417d192 100644 --- a/src/main/java/carpet/commands/CounterCommand.java +++ b/src/main/java/carpet/commands/CounterCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.helpers.HopperCounter; import carpet.utils.Messenger; import com.mojang.brigadier.CommandDispatcher; diff --git a/src/main/java/carpet/commands/DistanceCommand.java b/src/main/java/carpet/commands/DistanceCommand.java index 9e38af9f..97b8174a 100644 --- a/src/main/java/carpet/commands/DistanceCommand.java +++ b/src/main/java/carpet/commands/DistanceCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.settings.SettingsManager; import carpet.utils.DistanceCalculator; import com.mojang.brigadier.CommandDispatcher; diff --git a/src/main/java/carpet/commands/DrawCommand.java b/src/main/java/carpet/commands/DrawCommand.java index 554733da..41fbcda6 100644 --- a/src/main/java/carpet/commands/DrawCommand.java +++ b/src/main/java/carpet/commands/DrawCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.settings.SettingsManager; import carpet.utils.Messenger; import com.google.common.collect.Lists; diff --git a/src/main/java/carpet/commands/InfoCommand.java b/src/main/java/carpet/commands/InfoCommand.java index 131fe2b6..d6d08780 100644 --- a/src/main/java/carpet/commands/InfoCommand.java +++ b/src/main/java/carpet/commands/InfoCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.settings.SettingsManager; import carpet.utils.BlockInfo; import carpet.utils.EntityInfo; diff --git a/src/main/java/carpet/commands/LogCommand.java b/src/main/java/carpet/commands/LogCommand.java index 78f7bb3b..5570b5f7 100644 --- a/src/main/java/carpet/commands/LogCommand.java +++ b/src/main/java/carpet/commands/LogCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.logging.Logger; import carpet.logging.LoggerRegistry; import carpet.settings.SettingsManager; diff --git a/src/main/java/carpet/commands/MobAICommand.java b/src/main/java/carpet/commands/MobAICommand.java index f71727eb..34ab36da 100644 --- a/src/main/java/carpet/commands/MobAICommand.java +++ b/src/main/java/carpet/commands/MobAICommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.settings.SettingsManager; import carpet.utils.MobAI; import com.mojang.brigadier.CommandDispatcher; diff --git a/src/main/java/carpet/commands/PerimeterInfoCommand.java b/src/main/java/carpet/commands/PerimeterInfoCommand.java index 1090f1c0..94130c7e 100644 --- a/src/main/java/carpet/commands/PerimeterInfoCommand.java +++ b/src/main/java/carpet/commands/PerimeterInfoCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.settings.SettingsManager; import carpet.utils.Messenger; import carpet.utils.PerimeterDiagnostics; diff --git a/src/main/java/carpet/commands/PlayerCommand.java b/src/main/java/carpet/commands/PlayerCommand.java index 7446d6bc..1607bcd2 100644 --- a/src/main/java/carpet/commands/PlayerCommand.java +++ b/src/main/java/carpet/commands/PlayerCommand.java @@ -1,7 +1,7 @@ package carpet.commands; import carpet.helpers.EntityPlayerActionPack; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.fakes.ServerPlayerEntityInterface; import carpet.patches.EntityPlayerMPFake; import carpet.settings.SettingsManager; diff --git a/src/main/java/carpet/commands/ScriptCommand.java b/src/main/java/carpet/commands/ScriptCommand.java index 68ba904d..3544e06a 100644 --- a/src/main/java/carpet/commands/ScriptCommand.java +++ b/src/main/java/carpet/commands/ScriptCommand.java @@ -2,7 +2,7 @@ package carpet.commands; import carpet.CarpetServer; import carpet.script.CarpetScriptHost; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.script.CarpetEventServer; import carpet.script.CarpetExpression; import carpet.script.Expression; diff --git a/src/main/java/carpet/commands/SpawnCommand.java b/src/main/java/carpet/commands/SpawnCommand.java index fd504337..d141b291 100644 --- a/src/main/java/carpet/commands/SpawnCommand.java +++ b/src/main/java/carpet/commands/SpawnCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.helpers.HopperCounter; import carpet.helpers.TickSpeed; import carpet.settings.SettingsManager; diff --git a/src/main/java/carpet/commands/TickCommand.java b/src/main/java/carpet/commands/TickCommand.java index cc0e7f5c..b9e47b9a 100644 --- a/src/main/java/carpet/commands/TickCommand.java +++ b/src/main/java/carpet/commands/TickCommand.java @@ -1,6 +1,6 @@ package carpet.commands; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.helpers.TickSpeed; import carpet.settings.SettingsManager; import carpet.utils.CarpetProfiler; diff --git a/src/main/java/carpet/helpers/BlockRotator.java b/src/main/java/carpet/helpers/BlockRotator.java index de1b5307..dbeab79a 100644 --- a/src/main/java/carpet/helpers/BlockRotator.java +++ b/src/main/java/carpet/helpers/BlockRotator.java @@ -1,7 +1,7 @@ package carpet.helpers; import carpet.fakes.PistonBlockInterface; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.block.AbstractRedstoneGateBlock; import net.minecraft.block.BedBlock; import net.minecraft.block.Block; diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 2764ee3c..8f542373 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -1,6 +1,6 @@ package carpet.helpers; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.fakes.StructureFeatureInterface; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index 05c3330c..5e0184dd 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -7,14 +7,13 @@ import java.util.ArrayList; import java.util.List; import carpet.mixins.ExplosionAccessor; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.utils.Messenger; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.TntEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.fluid.FluidState; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleTypes; diff --git a/src/main/java/carpet/logging/Logger.java b/src/main/java/carpet/logging/Logger.java index 783cbd89..a6a5e4a4 100644 --- a/src/main/java/carpet/logging/Logger.java +++ b/src/main/java/carpet/logging/Logger.java @@ -1,7 +1,7 @@ package carpet.logging; import carpet.CarpetServer; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.BaseText; diff --git a/src/main/java/carpet/logging/LoggerRegistry.java b/src/main/java/carpet/logging/LoggerRegistry.java index c216c600..0ffd92b7 100644 --- a/src/main/java/carpet/logging/LoggerRegistry.java +++ b/src/main/java/carpet/logging/LoggerRegistry.java @@ -1,6 +1,6 @@ package carpet.logging; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.DyeColor; diff --git a/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java b/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java index b1943e26..55c19047 100644 --- a/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java b/src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java index 560ebb6f..2f9f59a3 100644 --- a/src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java +++ b/src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.structure.BuriedTreasureGenerator; import net.minecraft.world.Heightmap; import net.minecraft.world.IWorld; diff --git a/src/main/java/carpet/mixins/ChunkGeneratorMixin.java b/src/main/java/carpet/mixins/ChunkGeneratorMixin.java index c256e209..a30e002c 100644 --- a/src/main/java/carpet/mixins/ChunkGeneratorMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ChunkMixin.java b/src/main/java/carpet/mixins/ChunkMixin.java index d76f9f9e..75994ed6 100644 --- a/src/main/java/carpet/mixins/ChunkMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java b/src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java index cf6ef1d1..5cbf4461 100644 --- a/src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java +++ b/src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java @@ -1,7 +1,7 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/carpet/mixins/CloneCommandMixin.java b/src/main/java/carpet/mixins/CloneCommandMixin.java index d9426d80..dd33e699 100644 --- a/src/main/java/carpet/mixins/CloneCommandMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/CommandManagerMixin.java b/src/main/java/carpet/mixins/CommandManagerMixin.java index 98cb741d..bf81a60a 100644 --- a/src/main/java/carpet/mixins/CommandManagerMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ContainerMixin.java b/src/main/java/carpet/mixins/ContainerMixin.java index 22d4c174..f6cc0b29 100644 --- a/src/main/java/carpet/mixins/ContainerMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/CoralBlockMixin.java b/src/main/java/carpet/mixins/CoralBlockMixin.java index 88ed68cb..1521404f 100644 --- a/src/main/java/carpet/mixins/CoralBlockMixin.java +++ b/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; @@ -19,7 +19,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; diff --git a/src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java b/src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java index 59b5ea53..1ea4ab23 100644 --- a/src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/DirectionMixin.java b/src/main/java/carpet/mixins/DirectionMixin.java index 42812519..eb82727a 100644 --- a/src/main/java/carpet/mixins/DirectionMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/DispenserBlock_qcMixin.java b/src/main/java/carpet/mixins/DispenserBlock_qcMixin.java index c419fcee..83f0ecc3 100644 --- a/src/main/java/carpet/mixins/DispenserBlock_qcMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/EndCityFeatureMixin.java b/src/main/java/carpet/mixins/EndCityFeatureMixin.java index 4556a1a2..7a1c7798 100644 --- a/src/main/java/carpet/mixins/EndCityFeatureMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java b/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java index d1afb12e..f52a1741 100644 --- a/src/main/java/carpet/mixins/EntityTrackerEntry_leashFixMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java b/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java index d5de13d0..47bddb1c 100644 --- a/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java b/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java index 5ca180b1..c639b3cf 100644 --- a/src/main/java/carpet/mixins/ExperienceOrbEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ExplosionMixin.java b/src/main/java/carpet/mixins/ExplosionMixin.java index 182a82a2..7a7dab44 100644 --- a/src/main/java/carpet/mixins/ExplosionMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/FillCommandMixin.java b/src/main/java/carpet/mixins/FillCommandMixin.java index 7904201d..42fb38c5 100644 --- a/src/main/java/carpet/mixins/FillCommandMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java b/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java index 91bfc51c..7984d18e 100644 --- a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java b/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java index 2bc27e3b..5f57d65c 100644 --- a/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/FossilFeatureMixin.java b/src/main/java/carpet/mixins/FossilFeatureMixin.java index 92e7b5d9..77fb3817 100644 --- a/src/main/java/carpet/mixins/FossilFeatureMixin.java +++ b/src/main/java/carpet/mixins/FossilFeatureMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.world.Heightmap; import net.minecraft.world.IWorld; import net.minecraft.world.gen.feature.FossilFeature; diff --git a/src/main/java/carpet/mixins/GravityStructureProcessorMixin.java b/src/main/java/carpet/mixins/GravityStructureProcessorMixin.java index 137557f2..7303a22f 100644 --- a/src/main/java/carpet/mixins/GravityStructureProcessorMixin.java +++ b/src/main/java/carpet/mixins/GravityStructureProcessorMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.structure.processor.GravityStructureProcessor; import net.minecraft.world.Heightmap; import net.minecraft.world.ViewableWorld; diff --git a/src/main/java/carpet/mixins/GuardianEntityMixin.java b/src/main/java/carpet/mixins/GuardianEntityMixin.java index c72a5629..35ec3231 100644 --- a/src/main/java/carpet/mixins/GuardianEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/HopperBlockEntityMixin.java b/src/main/java/carpet/mixins/HopperBlockEntityMixin.java index e2bfb957..e6475fcb 100644 --- a/src/main/java/carpet/mixins/HopperBlockEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/HuskEntityMixin.java b/src/main/java/carpet/mixins/HuskEntityMixin.java index 0fe74a53..bb492c9a 100644 --- a/src/main/java/carpet/mixins/HuskEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java b/src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java index 988f460b..efd24377 100644 --- a/src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java +++ b/src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.structure.IglooGenerator; import net.minecraft.world.Heightmap; import net.minecraft.world.IWorld; diff --git a/src/main/java/carpet/mixins/InfestedBlockMixin.java b/src/main/java/carpet/mixins/InfestedBlockMixin.java index 5b2aeebb..c6b1199f 100644 --- a/src/main/java/carpet/mixins/InfestedBlockMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java index 3af00790..81b62372 100644 --- a/src/main/java/carpet/mixins/ItemEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/KelpFeatureMixin.java b/src/main/java/carpet/mixins/KelpFeatureMixin.java index 35a3a735..dd3d94db 100644 --- a/src/main/java/carpet/mixins/KelpFeatureMixin.java +++ b/src/main/java/carpet/mixins/KelpFeatureMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.world.gen.feature.KelpFeature; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java index 25af57e5..c06c980a 100644 --- a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/MinecraftClientMixin.java b/src/main/java/carpet/mixins/MinecraftClientMixin.java index 93dddc12..533288b5 100644 --- a/src/main/java/carpet/mixins/MinecraftClientMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/MobEntity_leashMixin.java b/src/main/java/carpet/mixins/MobEntity_leashMixin.java index f39d0b88..0b9be3fb 100644 --- a/src/main/java/carpet/mixins/MobEntity_leashMixin.java +++ b/src/main/java/carpet/mixins/MobEntity_leashMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.mob.MobEntity; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java b/src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java index 4cf03752..d16defd2 100644 --- a/src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java +++ b/src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.structure.OceanRuinGenerator; import net.minecraft.world.Heightmap; import net.minecraft.world.IWorld; diff --git a/src/main/java/carpet/mixins/OverworldChunkGeneratorMixin.java b/src/main/java/carpet/mixins/OverworldChunkGeneratorMixin.java index 7c8f6006..e0d2f022 100644 --- a/src/main/java/carpet/mixins/OverworldChunkGeneratorMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java b/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java index ea683c45..20a6fda5 100644 --- a/src/main/java/carpet/mixins/PickaxeItem_missingToolsMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java index f841ae43..84c94d9f 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java +++ b/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.BlockEntityRenderDispatcherInterface; import carpet.fakes.PistonBlockEntityInterface; import net.minecraft.block.entity.BlockEntity; diff --git a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java index 667950af..5e053b6e 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java index f2878acf..0b85b5ef 100644 --- a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java +++ b/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.*; diff --git a/src/main/java/carpet/mixins/PistonBlock_qcMixin.java b/src/main/java/carpet/mixins/PistonBlock_qcMixin.java index 71f09a15..527bc1ff 100644 --- a/src/main/java/carpet/mixins/PistonBlock_qcMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java b/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java index 7e7f7d84..fca97edb 100644 --- a/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PistonHandler_pushLimitMixin.java b/src/main/java/carpet/mixins/PistonHandler_pushLimitMixin.java index 8bfbb1b1..c170b259 100644 --- a/src/main/java/carpet/mixins/PistonHandler_pushLimitMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PlayerEntityMixin.java b/src/main/java/carpet/mixins/PlayerEntityMixin.java index 7b22f908..5070481c 100644 --- a/src/main/java/carpet/mixins/PlayerEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java b/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java index 79821518..8f8ee412 100644 --- a/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java +++ b/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.client.network.packet.EntityPositionS2CPacket; import net.minecraft.client.network.packet.VehicleMoveS2CPacket; import net.minecraft.entity.Entity; diff --git a/src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java b/src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java index 6c27bc42..2cbada37 100644 --- a/src/main/java/carpet/mixins/PlayerEntity_parrotMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java b/src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java index d92a16ba..337a6812 100644 --- a/src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java +++ b/src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.fakes.PortalForcerInterface; import net.minecraft.block.BlockState; import net.minecraft.block.PortalBlock; diff --git a/src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java b/src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java index 136d8796..f5e2fde2 100644 --- a/src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java +++ b/src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.fakes.PortalForcerInterface; import net.minecraft.entity.Entity; import net.minecraft.server.world.ChunkTicketType; diff --git a/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java b/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java index ea18d73a..047550ab 100644 --- a/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/PoweredRailBlock_powerLimitMixin.java b/src/main/java/carpet/mixins/PoweredRailBlock_powerLimitMixin.java index 685ed710..ed54cd83 100644 --- a/src/main/java/carpet/mixins/PoweredRailBlock_powerLimitMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/RedstoneWireBlockMixin.java b/src/main/java/carpet/mixins/RedstoneWireBlockMixin.java index 354985b3..c2247f27 100644 --- a/src/main/java/carpet/mixins/RedstoneWireBlockMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java b/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java index 1b115fd1..da6dd6c0 100644 --- a/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/SaplingBlockMixin.java b/src/main/java/carpet/mixins/SaplingBlockMixin.java index fb5dc59d..73187586 100644 --- a/src/main/java/carpet/mixins/SaplingBlockMixin.java +++ b/src/main/java/carpet/mixins/SaplingBlockMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.helpers.BlockSaplingHelper; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/carpet/mixins/ServerMetadata_motdMixin.java b/src/main/java/carpet/mixins/ServerMetadata_motdMixin.java index f6116d2d..666b729f 100644 --- a/src/main/java/carpet/mixins/ServerMetadata_motdMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java index 9ca0702e..5999c745 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java index 3ffd7d1b..c8b68d29 100644 --- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java b/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java index 3d76cca8..f74ded3a 100644 --- a/src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java b/src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java index 77f12cef..a2a1c080 100644 --- a/src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/SetBlockCommandMixin.java b/src/main/java/carpet/mixins/SetBlockCommandMixin.java index c435cbe2..eb050fd5 100644 --- a/src/main/java/carpet/mixins/SetBlockCommandMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java b/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java index 96f4b59f..4d89b0c4 100644 --- a/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java +++ b/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) diff --git a/src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java b/src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java index 8ed3032e..f9e59c3b 100644 --- a/src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java +++ b/src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.structure.ShipwreckGenerator; import net.minecraft.world.Heightmap; import net.minecraft.world.IWorld; diff --git a/src/main/java/carpet/mixins/SpawnHelperMixin.java b/src/main/java/carpet/mixins/SpawnHelperMixin.java index a9d7ccb5..4c33c7dc 100644 --- a/src/main/java/carpet/mixins/SpawnHelperMixin.java +++ b/src/main/java/carpet/mixins/SpawnHelperMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.fakes.WorldInterface; import carpet.utils.SpawnReporter; import net.minecraft.block.Block; @@ -24,9 +24,7 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.WorldChunk; 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.CallbackInfo; import java.util.Map; diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java index e95c2c2f..fa394f88 100644 --- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/StructureFeatureMixin.java b/src/main/java/carpet/mixins/StructureFeatureMixin.java index baf2b738..cac476f4 100644 --- a/src/main/java/carpet/mixins/StructureFeatureMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/StructurePieceMixin.java b/src/main/java/carpet/mixins/StructurePieceMixin.java index abecaed9..f4859078 100644 --- a/src/main/java/carpet/mixins/StructurePieceMixin.java +++ b/src/main/java/carpet/mixins/StructurePieceMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.structure.StructurePiece; import net.minecraft.world.Heightmap; import net.minecraft.world.ViewableWorld; diff --git a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java b/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java index 30e89b62..26fa426b 100644 --- a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/SummonCommandMixin.java b/src/main/java/carpet/mixins/SummonCommandMixin.java index 18495e73..8056e1ee 100644 --- a/src/main/java/carpet/mixins/SummonCommandMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/TntBlockMixin.java b/src/main/java/carpet/mixins/TntBlockMixin.java index a220f9a9..c6664ef7 100644 --- a/src/main/java/carpet/mixins/TntBlockMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/TntEntityMixin.java b/src/main/java/carpet/mixins/TntEntityMixin.java index c287be9c..9ad47540 100644 --- a/src/main/java/carpet/mixins/TntEntityMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java b/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java index bdd5e9b0..b780dd36 100644 --- a/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java index ac1d56d9..7016f1e2 100644 --- a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java +++ b/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; diff --git a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java index b71c623d..8c80014a 100644 --- a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java +++ b/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; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 9912af90..0aa969a0 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -20,7 +20,7 @@ import carpet.script.value.NullValue; import carpet.script.value.NumericValue; import carpet.script.value.StringValue; import carpet.script.value.Value; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.utils.BlockInfo; import carpet.utils.Messenger; import com.google.common.collect.Sets; diff --git a/src/main/java/carpet/script/CarpetScriptHost.java b/src/main/java/carpet/script/CarpetScriptHost.java index 15f37fa2..78905ee4 100644 --- a/src/main/java/carpet/script/CarpetScriptHost.java +++ b/src/main/java/carpet/script/CarpetScriptHost.java @@ -8,7 +8,7 @@ import carpet.script.value.FunctionValue; import carpet.script.value.NumericValue; import carpet.script.value.StringValue; import carpet.script.value.Value; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/src/main/java/carpet/script/CarpetScriptServer.java b/src/main/java/carpet/script/CarpetScriptServer.java index 32476bd6..47cb273f 100644 --- a/src/main/java/carpet/script/CarpetScriptServer.java +++ b/src/main/java/carpet/script/CarpetScriptServer.java @@ -4,7 +4,7 @@ import carpet.script.bundled.BundledModule; import carpet.script.value.FunctionValue; import carpet.script.value.MapValue; import carpet.script.value.StringValue; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.CarpetServer; import carpet.script.bundled.FileModule; import carpet.script.bundled.ModuleInterface; diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java index e64bdc1e..59977691 100644 --- a/src/main/java/carpet/settings/SettingsManager.java +++ b/src/main/java/carpet/settings/SettingsManager.java @@ -1,6 +1,7 @@ package carpet.settings; import carpet.CarpetServer; +import carpet.CarpetSettings; import carpet.utils.Messenger; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index 4370de9a..984fbbe9 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -1,6 +1,6 @@ package carpet.utils; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import net.minecraft.entity.Entity; import net.minecraft.server.MinecraftServer; import net.minecraft.block.entity.BlockEntity; diff --git a/src/main/java/carpet/utils/WoolTool.java b/src/main/java/carpet/utils/WoolTool.java index 3df95d1f..9f47507a 100644 --- a/src/main/java/carpet/utils/WoolTool.java +++ b/src/main/java/carpet/utils/WoolTool.java @@ -1,6 +1,6 @@ package carpet.utils; -import carpet.settings.CarpetSettings; +import carpet.CarpetSettings; import carpet.helpers.HopperCounter; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor;