Remove distmarker annotations

src/main/java/exopandora/worldhandler/builder/CommandBuilder.java

@@ -19,10 +19,7 @@ import exopandora.worldhandler.builder.types.ItemResourceLocation;
 import exopandora.worldhandler.builder.types.TargetSelector;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class CommandBuilder implements ICommandBuilderSyntax
 {
 	private List<Entry<Argument, String>> command;

src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java

@@ -8,10 +8,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.component.IBuilderComponent;
 import exopandora.worldhandler.util.NBTHelper;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class CommandBuilderNBT extends CommandBuilder implements ICommandBuilderNBT
 {
 	private final List<IBuilderComponent> TAG_TO_COMPONENT = new ArrayList<IBuilderComponent>();

src/main/java/exopandora/worldhandler/builder/CommandString.java

@@ -1,10 +1,7 @@
 package exopandora.worldhandler.builder;
 
 import net.minecraft.ChatFormatting;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class CommandString
 {
 	private final StringBuilder command = new StringBuilder("/");

src/main/java/exopandora/worldhandler/builder/CommandSyntax.java

@@ -6,10 +6,7 @@ import java.util.List;
 import com.google.gson.annotations.SerializedName;
 
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class CommandSyntax
 {
 	private List<Argument> syntax = new ArrayList<Argument>();
@@ -53,7 +50,6 @@ public class CommandSyntax
 		return this.syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static class Argument
 	{
 		@SerializedName("name")

src/main/java/exopandora/worldhandler/builder/ICommandBuilderNBT.java

@@ -1,10 +1,7 @@
 package exopandora.worldhandler.builder;
 
 import net.minecraft.nbt.CompoundTag;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public interface ICommandBuilderNBT extends ICommandBuilder
 {
 	void setNBT(CompoundTag nbt);

src/main/java/exopandora/worldhandler/builder/INBTWritable.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder;
 import javax.annotation.Nullable;
 
 import net.minecraft.nbt.Tag;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public interface INBTWritable
 {
 	@Nullable

src/main/java/exopandora/worldhandler/builder/component/IBuilderComponent.java

@@ -1,10 +1,7 @@
 package exopandora.worldhandler.builder.component;
 
 import exopandora.worldhandler.builder.INBTWritable;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public interface IBuilderComponent extends INBTWritable
 {
 	String getTag();

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttribute.java

@@ -9,11 +9,8 @@ import java.util.stream.Collectors;
 import exopandora.worldhandler.builder.component.IBuilderComponent;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.world.entity.ai.attributes.Attribute;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class ComponentAttribute implements IBuilderComponent
 {	
 	public static final List<Attribute> ATTRIBUTES = ForgeRegistries.ATTRIBUTES.getValues().stream().filter(attribute -> !attribute.getDescriptionId().equals(I18n.get(attribute.getDescriptionId()))).collect(Collectors.toList());

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeItem.java

@@ -9,10 +9,7 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.entity.ai.attributes.Attribute;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ComponentAttributeItem extends ComponentAttribute
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeMob.java

@@ -8,10 +8,7 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.entity.ai.attributes.Attribute;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ComponentAttributeMob extends ComponentAttribute
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentCustom.java

@@ -2,10 +2,7 @@ package exopandora.worldhandler.builder.component.impl;
 
 import exopandora.worldhandler.builder.component.IBuilderComponent;
 import net.minecraft.nbt.Tag;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ComponentCustom implements IBuilderComponent
 {
 	private Tag nbt;

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java

@@ -7,10 +7,7 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ComponentDisplay implements IBuilderComponent 
 {
 	private MutableTextComponent name = new MutableTextComponent();

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentEnchantment.java

@@ -12,11 +12,8 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ComponentEnchantment implements IBuilderComponent
 {
 	private Map<Enchantment, Short> enchantments = new HashMap<Enchantment, Short>();

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotion.java

@@ -12,10 +12,7 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.effect.MobEffect;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class ComponentPotion implements IBuilderComponent 
 {
 	protected final Map<MobEffect, EffectNBT> potions = new HashMap<MobEffect, EffectNBT>();

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionItem.java

@@ -1,9 +1,5 @@
 package exopandora.worldhandler.builder.component.impl;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public class ComponentPotionItem extends ComponentPotion
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionMob.java

@@ -1,9 +1,5 @@
 package exopandora.worldhandler.builder.component.impl;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public class ComponentPotionMob extends ComponentPotion
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java

@@ -18,10 +18,7 @@ import net.minecraft.nbt.LongTag;
 import net.minecraft.nbt.ShortTag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ComponentTag<T> implements IBuilderComponent
 {
 	private final Function<T, Tag> serializer;

src/main/java/exopandora/worldhandler/builder/component/impl/EffectNBT.java

@@ -2,10 +2,7 @@ package exopandora.worldhandler.builder.component.impl;
 
 import exopandora.worldhandler.builder.INBTWritable;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class EffectNBT implements INBTWritable
 {
 	private byte amplifier;

src/main/java/exopandora/worldhandler/builder/component/impl/EntityNBT.java

@@ -27,10 +27,7 @@ import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class EntityNBT implements IBuilderComponent
 {
 	private ResourceLocation id;

src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.util.EnumHelper;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderAdvancement extends CommandBuilder
 {
 	public BuilderAdvancement(EnumMode mode)
@@ -99,7 +96,6 @@ public class BuilderAdvancement extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumActionType
 	{
 		GRANT,
@@ -112,7 +108,6 @@ public class BuilderAdvancement extends CommandBuilder
 		}
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ONLY,

src/main/java/exopandora/worldhandler/builder/impl/BuilderBlockPos.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilderNBT;
 import exopandora.worldhandler.builder.types.CoordinateInt;
 import net.minecraft.core.BlockPos;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class BuilderBlockPos extends CommandBuilderNBT
 {
 	private final int offset;

src/main/java/exopandora/worldhandler/builder/impl/BuilderButcher.java

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.builder.types.TargetSelector;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderButcher extends CommandBuilder
 {
 	private final TargetSelector targetSelector = new TargetSelector();

src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java

@@ -9,10 +9,7 @@ import exopandora.worldhandler.builder.types.Coordinate.EnumType;
 import exopandora.worldhandler.builder.types.CoordinateInt;
 import exopandora.worldhandler.util.EnumHelper;
 import net.minecraft.core.BlockPos;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderClone extends BuilderDoubleBlockPos
 {
 	public BuilderClone()
@@ -156,7 +153,6 @@ public class BuilderClone extends BuilderDoubleBlockPos
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMask
 	{
 		FILTERED,

src/main/java/exopandora/worldhandler/builder/impl/BuilderCustomItem.java

@@ -10,10 +10,7 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderCustomItem extends BuilderGive
 {
 	private final ComponentAttributeItem attribute;

src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java

@@ -11,10 +11,7 @@ import exopandora.worldhandler.util.EnumHelper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderData extends BuilderBlockPos
 {
 	private final TargetSelector targetSelector = new TargetSelector();
@@ -299,7 +296,6 @@ public class BuilderData extends BuilderBlockPos
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		GET,
@@ -313,7 +309,6 @@ public class BuilderData extends BuilderBlockPos
 		}
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumTarget
 	{
 		BLOCK,

src/main/java/exopandora/worldhandler/builder/impl/BuilderDifficulty.java

@@ -4,10 +4,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import net.minecraft.world.Difficulty;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderDifficulty extends CommandBuilder
 {
 	public BuilderDifficulty()

src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.types.CoordinateInt;
 import exopandora.worldhandler.util.BlockHelper;
 import net.minecraft.core.BlockPos;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class BuilderDoubleBlockPos extends CommandBuilder
 {
 	public BuilderDoubleBlockPos()

src/main/java/exopandora/worldhandler/builder/impl/BuilderEnchantment.java

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderEnchantment extends CommandBuilder
 {
 	@Nullable

src/main/java/exopandora/worldhandler/builder/impl/BuilderEntity.java

@@ -26,11 +26,8 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class BuilderEntity extends CommandBuilderNBT
 {
 	private final EntityNBT nbt = new EntityNBT();

src/main/java/exopandora/worldhandler/builder/impl/BuilderExecute.java

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.util.EnumHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderExecute extends CommandBuilder
 {
 	public void setMode1(EnumMode mode)
@@ -82,7 +79,6 @@ public class BuilderExecute extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ALIGN,

src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.util.EnumHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderExperience extends CommandBuilder
 {
 	public BuilderExperience()
@@ -103,7 +100,6 @@ public class BuilderExperience extends CommandBuilder
 		return new BuilderExperience(EnumMode.SET, 0, this.getPlayer(), EnumUnit.LEVELS);
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,
@@ -117,7 +113,6 @@ public class BuilderExperience extends CommandBuilder
 		}
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumUnit
 	{
 		LEVELS,

src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java

@@ -9,10 +9,7 @@ import exopandora.worldhandler.builder.types.CoordinateInt;
 import exopandora.worldhandler.util.BlockHelper;
 import exopandora.worldhandler.util.EnumHelper;
 import net.minecraft.core.BlockPos;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderFill extends BuilderDoubleBlockPos
 {
 	public BuilderFill()
@@ -122,7 +119,6 @@ public class BuilderFill extends BuilderDoubleBlockPos
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumBlockFilter
 	{
 		REPLACE,

src/main/java/exopandora/worldhandler/builder/impl/BuilderGamemode.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderGamemode extends CommandBuilder
 {
 	public BuilderGamemode()
@@ -52,7 +49,6 @@ public class BuilderGamemode extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumGamemode
 	{
 		SURVIVAL,

src/main/java/exopandora/worldhandler/builder/impl/BuilderGamerule.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderGamerule extends CommandBuilder
 {
 	public BuilderGamerule()

src/main/java/exopandora/worldhandler/builder/impl/BuilderGeneric.java

@@ -2,10 +2,7 @@ package exopandora.worldhandler.builder.impl;
 
 import exopandora.worldhandler.builder.CommandString;
 import exopandora.worldhandler.builder.ICommandBuilder;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderGeneric implements ICommandBuilder
 {
 	private final String command;

src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java

@@ -9,11 +9,8 @@ import exopandora.worldhandler.builder.types.ItemResourceLocation;
 import exopandora.worldhandler.util.ResourceHelper;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderGive extends CommandBuilderNBT
 {
 	private final ItemResourceLocation itemResourceLocation = new ItemResourceLocation();

src/main/java/exopandora/worldhandler/builder/impl/BuilderMultiCommand.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import java.util.Arrays;
 
 import exopandora.worldhandler.builder.ICommandBuilder;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderMultiCommand implements ICommandBuilder
 {
 	private final ICommandBuilder[] builders;

src/main/java/exopandora/worldhandler/builder/impl/BuilderNoteEditor.java

@@ -5,10 +5,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderNoteEditor extends BuilderSetBlock
 {
 	public BuilderNoteEditor()

src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayer.java

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderPlayer extends CommandBuilder
 {
 	private final String command;

src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayerReason.java

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderPlayerReason extends CommandBuilder
 {
 	private final String command;

src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionEffect.java

@@ -8,11 +8,8 @@ import exopandora.worldhandler.builder.component.impl.EffectNBT;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffect;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderPotionEffect extends CommandBuilder
 {
 	private int seconds;
@@ -186,7 +183,6 @@ public class BuilderPotionEffect extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		GIVE,

src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionItem.java

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.component.impl.ComponentPotionItem;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.item.Item;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderPotionItem extends BuilderGive
 {
 	private final ComponentPotionItem potion;

src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java

@@ -8,10 +8,7 @@ import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.util.EnumHelper;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Recipe;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderRecipe extends CommandBuilder
 {
 	public BuilderRecipe()
@@ -87,7 +84,6 @@ public class BuilderRecipe extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		GIVE,

src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboard.java

@@ -1,10 +1,7 @@
 package exopandora.worldhandler.builder.impl;
 
 import exopandora.worldhandler.builder.CommandBuilder;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class BuilderScoreboard extends CommandBuilder
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java

@@ -3,13 +3,10 @@ package exopandora.worldhandler.builder.impl;
 import javax.annotation.Nullable;
 
 import exopandora.worldhandler.builder.CommandSyntax;
+import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.builder.types.GreedyString;
 import exopandora.worldhandler.util.EnumHelper;
-import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderScoreboardObjectives extends BuilderScoreboard
 {
 	public BuilderScoreboardObjectives()
@@ -161,7 +158,6 @@ public class BuilderScoreboardObjectives extends BuilderScoreboard
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,

src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardPlayers.java

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.util.EnumHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderScoreboardPlayers extends BuilderScoreboard
 {
 	public BuilderScoreboardPlayers()
@@ -156,7 +153,6 @@ public class BuilderScoreboardPlayers extends BuilderScoreboard
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,

src/main/java/exopandora/worldhandler/builder/impl/BuilderSetBlock.java

@@ -8,10 +8,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderSetBlock extends BuilderBlockPos
 {
 	private final BlockResourceLocation blockResourceLocation = new BlockResourceLocation();
@@ -93,7 +90,6 @@ public class BuilderSetBlock extends BuilderBlockPos
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		KEEP,

src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.component.impl.ComponentTag;
 import exopandora.worldhandler.util.MutableTextComponent;
 import exopandora.worldhandler.util.SignText;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderSignEditor extends BuilderData
 {
 	@SuppressWarnings("unchecked")

src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java

@@ -2,13 +2,10 @@ package exopandora.worldhandler.builder.impl;
 
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
+import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.builder.types.Coordinate.EnumType;
 import exopandora.worldhandler.builder.types.CoordinateInt;
-import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderSpawnpoint extends CommandBuilder
 {
 	public BuilderSpawnpoint()

src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.types.Coordinate.EnumType;
 import exopandora.worldhandler.builder.types.CoordinateDouble;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderSummon extends BuilderEntity
 {
 	public BuilderSummon()

src/main/java/exopandora/worldhandler/builder/impl/BuilderTag.java

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderTag extends CommandBuilder
 {
 	public BuilderTag()
@@ -76,7 +73,6 @@ public class BuilderTag extends CommandBuilder
 		return new BuilderTag(this.getPlayer(), mode, this.getName());
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,

src/main/java/exopandora/worldhandler/builder/impl/BuilderTeams.java

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.builder.types.GreedyString;
 import exopandora.worldhandler.util.EnumHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderTeams extends CommandBuilder
 {
 	public void setTeam(String name)
@@ -228,7 +225,6 @@ public class BuilderTeams extends CommandBuilder
 		return "team";
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		JOIN,

src/main/java/exopandora/worldhandler/builder/impl/BuilderTime.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderTime extends CommandBuilder
 {
 	public BuilderTime()
@@ -52,7 +49,6 @@ public class BuilderTime extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,

src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
 import exopandora.worldhandler.util.EnumHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderTrigger extends CommandBuilder
 {
 	public BuilderTrigger()
@@ -82,7 +79,6 @@ public class BuilderTrigger extends CommandBuilder
 		return new BuilderTrigger(this.getObjective(), mode, this.getValue());
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,

src/main/java/exopandora/worldhandler/builder/impl/BuilderUsercontent.java

@@ -14,10 +14,7 @@ import exopandora.worldhandler.builder.types.ItemResourceLocation;
 import exopandora.worldhandler.builder.types.TargetSelector;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderUsercontent extends CommandBuilder
 {
 	private final String name;

src/main/java/exopandora/worldhandler/builder/impl/BuilderWH.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderWH extends CommandBuilder
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/impl/BuilderWeather.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderWeather extends CommandBuilder
 {
 	public BuilderWeather()
@@ -52,7 +49,6 @@ public class BuilderWeather extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumWeather
 	{
 		CLEAR,

src/main/java/exopandora/worldhandler/builder/impl/BuilderWhitelist.java

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderWhitelist extends CommandBuilder
 {
 	public BuilderWhitelist()
@@ -77,7 +74,6 @@ public class BuilderWhitelist extends CommandBuilder
 		return syntax;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumMode
 	{
 		ADD,

src/main/java/exopandora/worldhandler/builder/impl/BuilderWorldHandler.java

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
 import exopandora.worldhandler.builder.CommandBuilder;
 import exopandora.worldhandler.builder.CommandSyntax;
 import exopandora.worldhandler.builder.types.ArgumentType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class BuilderWorldHandler extends CommandBuilder
 {
 	@Override

src/main/java/exopandora/worldhandler/builder/types/ArgumentType.java

@@ -9,10 +9,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public enum ArgumentType
 {
 	SHORT(Short::valueOf),

src/main/java/exopandora/worldhandler/builder/types/BlockResourceLocation.java

@@ -10,11 +10,8 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class BlockResourceLocation extends ItemResourceLocation
 {
 	private BlockState state;

src/main/java/exopandora/worldhandler/builder/types/Coordinate.java

@@ -2,10 +2,6 @@ package exopandora.worldhandler.builder.types;
 
 import java.util.function.Function;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public abstract class Coordinate<T extends Number> implements ICoordinate<T>
 {
 	protected T value;
@@ -69,7 +65,6 @@ public abstract class Coordinate<T extends Number> implements ICoordinate<T>
 		return coordiante;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumType
 	{
 		/**

src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java

@@ -1,9 +1,5 @@
 package exopandora.worldhandler.builder.types;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public class CoordinateDouble extends Coordinate<Double>
 {
 	public CoordinateDouble()

src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java

@@ -1,9 +1,5 @@
 package exopandora.worldhandler.builder.types;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public class CoordinateInt extends Coordinate<Integer>
 {
 	public CoordinateInt()

src/main/java/exopandora/worldhandler/builder/types/GreedyString.java

@@ -2,10 +2,6 @@ package exopandora.worldhandler.builder.types;
 
 import javax.annotation.Nullable;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public class GreedyString
 {
 	private String string;

src/main/java/exopandora/worldhandler/builder/types/ICoordinate.java

@@ -1,9 +1,5 @@
 package exopandora.worldhandler.builder.types;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public interface ICoordinate<T extends Number>
 {
 	T zero();

src/main/java/exopandora/worldhandler/builder/types/ItemResourceLocation.java

@@ -7,10 +7,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ItemResourceLocation
 {
 	protected ResourceLocation resource;

src/main/java/exopandora/worldhandler/builder/types/TargetSelector.java

@@ -7,10 +7,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
 public class TargetSelector
 {
 	private final Map<String, Object> values = new HashMap<String, Object>();

src/main/java/exopandora/worldhandler/config/Config.java

@@ -8,8 +8,6 @@ import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 
 import exopandora.worldhandler.event.KeyHandler;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.config.ModConfig.Type;
@@ -27,7 +25,6 @@ public class Config
 		CLIENT = pair.getLeft();
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static class ClientConfig
 	{
 		private final ConfigCategorySettings settings;

src/main/java/exopandora/worldhandler/config/ConfigCategoryButcher.java

@@ -7,13 +7,10 @@ import java.util.stream.Collectors;
 import com.google.common.base.Predicates;
 
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ConfigCategoryButcher
 {
 	private final ConfigValue<List<? extends String>> entities;

src/main/java/exopandora/worldhandler/config/ConfigCategorySettings.java

@@ -2,14 +2,11 @@ package exopandora.worldhandler.config;
 
 import exopandora.worldhandler.builder.impl.BuilderSetBlock.EnumMode;
 import exopandora.worldhandler.event.KeyHandler;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
 import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
 import net.minecraftforge.common.ForgeConfigSpec.IntValue;
 
-@OnlyIn(Dist.CLIENT)
 public class ConfigCategorySettings
 {
 	private final BooleanValue commandSyntax;

src/main/java/exopandora/worldhandler/config/ConfigCategorySkin.java

@@ -2,14 +2,11 @@ package exopandora.worldhandler.config;
 
 import java.util.Arrays;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
 import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
 import net.minecraftforge.common.ForgeConfigSpec.IntValue;
 
-@OnlyIn(Dist.CLIENT)
 public class ConfigCategorySkin
 {
 	private final ConfigValue<EnumIconSize> iconSize;
@@ -275,7 +272,6 @@ public class ConfigCategorySkin
 		Config.set(this.buttonAlpha, alpha);
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum EnumIconSize
 	{
 		x16,

src/main/java/exopandora/worldhandler/config/ConfigCategorySliders.java

@@ -1,11 +1,8 @@
 package exopandora.worldhandler.config;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.ForgeConfigSpec.DoubleValue;
 
-@OnlyIn(Dist.CLIENT)
 public class ConfigCategorySliders
 {
 	private final DoubleValue maxPotionAmplifier;

src/main/java/exopandora/worldhandler/event/ClientEventHandler.java

@@ -17,13 +17,10 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.ClientChatEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
-@OnlyIn(Dist.CLIENT)
 public class ClientEventHandler
 {
 	@SubscribeEvent

src/main/java/exopandora/worldhandler/event/KeyHandler.java

@@ -8,13 +8,10 @@ import exopandora.worldhandler.util.ActionHelper;
 import exopandora.worldhandler.util.BlockHelper;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.InputEvent.KeyInputEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fmlclient.registry.ClientRegistry;
 
-@OnlyIn(Dist.CLIENT)
 public class KeyHandler
 {
 	public static final KeyMapping KEY_WORLD_HANDLER = new KeyMapping("key.worldhandler", GLFW.GLFW_KEY_V, "key.categories.worldhandler");

src/main/java/exopandora/worldhandler/gui/DummyScreen.java

@@ -2,10 +2,7 @@ package exopandora.worldhandler.gui;
 
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class DummyScreen extends Screen
 {
 	private final Runnable runnable;

src/main/java/exopandora/worldhandler/gui/category/Categories.java

@@ -2,10 +2,7 @@ package exopandora.worldhandler.gui.category;
 
 import exopandora.worldhandler.Main;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class Categories
 {
 	public static final Category MAIN = Categories.getRegisteredCategory("main");

src/main/java/exopandora/worldhandler/gui/category/Category.java

@@ -15,8 +15,6 @@ import exopandora.worldhandler.usercontent.UsercontentLoader;
 import exopandora.worldhandler.usercontent.model.JsonTab;
 import exopandora.worldhandler.util.RegistryHelper;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.event.RegistryEvent.NewRegistry;
 import net.minecraftforge.event.RegistryEvent.Register;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -24,7 +22,6 @@ import net.minecraftforge.registries.ForgeRegistryEntry;
 import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.RegistryBuilder;
 
-@OnlyIn(Dist.CLIENT)
 public class Category extends ForgeRegistryEntry<Category>
 {
 	public static IForgeRegistry<Category> REGISTRY;

src/main/java/exopandora/worldhandler/gui/container/Container.java

@@ -12,10 +12,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class Container extends Screen implements IContainer
 {
 	protected final List<IMenu> menus = new ArrayList<IMenu>();

src/main/java/exopandora/worldhandler/gui/container/IContainer.java

@@ -6,10 +6,7 @@ import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Widget;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public interface IContainer
 {
 	<T extends GuiEventListener & Widget & NarratableEntry> T add(T button);

src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java

@@ -29,10 +29,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Widget;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class GuiWorldHandler extends Container
 {
 	private static String player = Minecraft.getInstance().getUser().getName();

src/main/java/exopandora/worldhandler/gui/content/Content.java

@@ -36,8 +36,6 @@ import exopandora.worldhandler.usercontent.UsercontentConfig;
 import exopandora.worldhandler.usercontent.UsercontentLoader;
 import exopandora.worldhandler.util.RegistryHelper;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.event.RegistryEvent.NewRegistry;
 import net.minecraftforge.event.RegistryEvent.Register;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -45,7 +43,6 @@ import net.minecraftforge.registries.ForgeRegistryEntry;
 import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.RegistryBuilder;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class Content extends ForgeRegistryEntry<Content> implements IContent
 {
 	public static IForgeRegistry<Content> REGISTRY;

src/main/java/exopandora/worldhandler/gui/content/Contents.java

@@ -5,10 +5,7 @@ import exopandora.worldhandler.gui.content.impl.ContentButcherPresets;
 import exopandora.worldhandler.gui.content.impl.ContentChild;
 import exopandora.worldhandler.gui.content.impl.ContentContinue;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class Contents
 {
 	public static final Content MAIN = Contents.getRegisteredContent("main");

src/main/java/exopandora/worldhandler/gui/content/IContent.java

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.ICommandBuilder;
 import exopandora.worldhandler.gui.category.Category;
 import exopandora.worldhandler.gui.widget.IWidget;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public interface IContent extends IWidget
 {
 	Category getCategory();

src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java

@@ -27,11 +27,8 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.advancements.Advancement;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraft.network.chat.TranslatableComponent;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentAdvancements extends Content
 {
 	private final BuilderAdvancement builderAdvancement = new BuilderAdvancement(EnumMode.values()[0]);

src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java

@@ -27,11 +27,8 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.AABB;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentButcher extends Content
 {
 	private GuiTextFieldTooltip radiusField;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherPresets.java

@@ -9,11 +9,8 @@ import exopandora.worldhandler.util.ActionHelper;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentButcherPresets extends ContentChild
 {
 	private ICommandBuilder builder;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java

@@ -16,11 +16,8 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EntityType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentButcherSettings extends ContentChild
 {
 	private ResourceLocation entity;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java

@@ -24,10 +24,7 @@ import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.LevelSettings;
 import net.minecraft.world.level.levelgen.WorldGenSettings;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentChangeWorld extends ContentChild
 {
 	@Override

src/main/java/exopandora/worldhandler/gui/content/impl/ContentChild.java

@@ -4,10 +4,7 @@ import exopandora.worldhandler.gui.category.Category;
 import exopandora.worldhandler.gui.content.Content;
 import exopandora.worldhandler.gui.content.Contents;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class ContentChild extends Content
 {
 	private Content parent;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentCommandStack.java

@@ -36,10 +36,7 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentCommandStack extends ContentChild
 {
 	private static final int HEAD_LENGTH = 1;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java

@@ -21,10 +21,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentContainers extends Content
 {
 	@Override

src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java

@@ -11,10 +11,7 @@ import exopandora.worldhandler.util.ActionHelper;
 import exopandora.worldhandler.util.CommandHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentContinue extends ContentChild
 {
 	private ICommandBuilder builder;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java

@@ -32,11 +32,8 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentCustomItem extends Content
 {
 	private GuiTextFieldTooltip itemField;
@@ -345,7 +342,6 @@ public class ContentCustomItem extends Content
 		this.builderCutomItem.setPlayer(username);
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum Page
 	{
 		START,

src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java

@@ -29,11 +29,8 @@ import exopandora.worldhandler.util.ResourceHelper;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentEditBlocks extends Content
 {
 	private GuiTextFieldTooltip x1Field;
@@ -436,7 +433,6 @@ public class ContentEditBlocks extends Content
 		return Contents.EDIT_BLOCKS;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum Page
 	{
 		COORDINATES,

src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java

@@ -22,11 +22,8 @@ import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentEnchantment extends Content
 {
 	private final BuilderEnchantment builderEnchantment = new BuilderEnchantment();

src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java

@@ -16,10 +16,7 @@ import exopandora.worldhandler.util.ActionHelper;
 import exopandora.worldhandler.util.CommandHelper;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentExperience extends Content
 {
 	private final BuilderExperience builderExperience = new BuilderExperience();

src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java

@@ -29,10 +29,7 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.GameRules.GameRuleTypeVisitor;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentGamerules extends Content
 {
 	private GuiTextFieldTooltip valueField;

src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java

@@ -17,10 +17,7 @@ import net.minecraft.client.gui.screens.packs.PackSelectionScreen;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentMain extends Content
 {
 	@Override

src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java

@@ -27,10 +27,7 @@ import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-@OnlyIn(Dist.CLIENT)
 public class ContentMultiplayer extends Content
 {
 	private GuiTextFieldTooltip playerField;
@@ -333,7 +330,6 @@ public class ContentMultiplayer extends Content
 		return null;
 	}
 	
-	@OnlyIn(Dist.CLIENT)
 	public static enum Page
 	{
 		KICK_AND_BAN(0),