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

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.7.2+build.174
 
 # Mod Properties
-	mod_version = 1.2.6+v191209
+	mod_version = 1.3.0+v191210
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/CarpetExtension.java

@@ -47,4 +47,6 @@ public interface CarpetExtension
     default void onPlayerLoggedOut(ServerPlayerEntity player) {}
 
     default void onServerClosed(MinecraftServer server) {}
+
+    default String version() {return null;}
 }

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;
@@ -33,6 +32,7 @@ public class CarpetServer // static for now - easier to handle all around the co
 {
     public static final Random rand = new Random((int)((2>>16)*Math.random()));
     public static MinecraftServer minecraft_server;
+    private static CommandDispatcher<ServerCommandSource> currentCommandDispatcher;
     public static CarpetScriptServer scriptServer;
     public static SettingsManager settingsManager;
     public static List<CarpetExtension> extensions = new ArrayList<>();
@@ -41,6 +41,13 @@ public class CarpetServer // static for now - easier to handle all around the co
     public static void manageExtension(CarpetExtension extension)
     {
         extensions.add(extension);
+        // for extensions that come late to the party, after server is created / loaded
+        // we will handle them now.
+        // that would handle all extensions, even these that add themselves really late to the party
+        if (currentCommandDispatcher != null)
+        {
+            extension.registerCommands(currentCommandDispatcher);
+        }
     }
 
     public static void onGameStarted()
@@ -93,7 +100,10 @@ public class CarpetServer // static for now - easier to handle all around the co
         DrawCommand.register(dispatcher);
         ScriptCommand.register(dispatcher);
         MobAICommand.register(dispatcher);
+        // registering command of extensions that has registered before either server is created
+        // for all other, they will have them registered when they add themselves
         extensions.forEach(e -> e.registerCommands(dispatcher));
+        currentCommandDispatcher = dispatcher;
         //TestCommand.register(dispatcher);
     }
 
@@ -111,6 +121,7 @@ public class CarpetServer // static for now - easier to handle all around the co
 
     public static void onServerClosed(MinecraftServer server)
     {
+        currentCommandDispatcher = null;
         scriptServer.onClose();
         settingsManager.detachServer();
         LoggerRegistry.stopLoggers();

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;
@@ -29,7 +31,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.2.6+v191209";
+    public static final String carpetVersion = "1.3.0+v191210";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;
@@ -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<T> extends Validator<T> {
+    private static class CheckOptimizedTntEnabledValidator<T> extends Validator<T>
+    {
         @Override
         public T validate(ServerCommandSource source, ParsedRule<T> currentRule, T newValue, String string) {
             return optimizedTNT || currentRule.defaultValue.equals(newValue) ? newValue : null;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;

src/main/java/carpet/helpers/OptimizedExplosion.java

@@ -8,7 +8,7 @@ import java.util.Collections;
 import java.util.List;
 
 import carpet.mixins.ExplosionAccessor;
-import carpet.settings.CarpetSettings;
+import carpet.CarpetSettings;
 import carpet.utils.Messenger;
 import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.objects.Object2DoubleOpenHashMap;
@@ -22,7 +22,6 @@ import net.minecraft.block.Material;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.ItemEntity;
 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;

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;

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;
 

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;

src/main/java/carpet/script/CarpetExpression.java

@@ -21,7 +21,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;

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;

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;

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;

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;

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;

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "carpet",
-  "version": "1.2.6",
+  "version": "1.3.0",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",