diff --git a/src/main/java/exopandora/worldhandler/builder/CommandBuilder.java b/src/main/java/exopandora/worldhandler/builder/CommandBuilder.java index a3ee1cd..e024551 100644 --- a/src/main/java/exopandora/worldhandler/builder/CommandBuilder.java +++ b/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> command; diff --git a/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java b/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java index 7f3f4c6..a5d6186 100644 --- a/src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java +++ b/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 TAG_TO_COMPONENT = new ArrayList(); diff --git a/src/main/java/exopandora/worldhandler/builder/CommandString.java b/src/main/java/exopandora/worldhandler/builder/CommandString.java index a54580e..a91cd9b 100644 --- a/src/main/java/exopandora/worldhandler/builder/CommandString.java +++ b/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("/"); diff --git a/src/main/java/exopandora/worldhandler/builder/CommandSyntax.java b/src/main/java/exopandora/worldhandler/builder/CommandSyntax.java index 4b99116..02bfb16 100644 --- a/src/main/java/exopandora/worldhandler/builder/CommandSyntax.java +++ b/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 syntax = new ArrayList(); @@ -53,7 +50,6 @@ public class CommandSyntax return this.syntax; } - @OnlyIn(Dist.CLIENT) public static class Argument { @SerializedName("name") diff --git a/src/main/java/exopandora/worldhandler/builder/ICommandBuilderNBT.java b/src/main/java/exopandora/worldhandler/builder/ICommandBuilderNBT.java index c96049a..ebdcda9 100644 --- a/src/main/java/exopandora/worldhandler/builder/ICommandBuilderNBT.java +++ b/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); diff --git a/src/main/java/exopandora/worldhandler/builder/INBTWritable.java b/src/main/java/exopandora/worldhandler/builder/INBTWritable.java index 57ec93e..3e01455 100644 --- a/src/main/java/exopandora/worldhandler/builder/INBTWritable.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/component/IBuilderComponent.java b/src/main/java/exopandora/worldhandler/builder/component/IBuilderComponent.java index f0568ea..fa710e8 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/IBuilderComponent.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttribute.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttribute.java index 779b16c..e733e43 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttribute.java +++ b/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 ATTRIBUTES = ForgeRegistries.ATTRIBUTES.getValues().stream().filter(attribute -> !attribute.getDescriptionId().equals(I18n.get(attribute.getDescriptionId()))).collect(Collectors.toList()); diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeItem.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeItem.java index d67f416..a8d85c6 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeItem.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeMob.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeMob.java index 6e138c7..de290c0 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeMob.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentCustom.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentCustom.java index 3d5fa6d..2e77784 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentCustom.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java index e881429..5befcf1 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentEnchantment.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentEnchantment.java index cef63ea..cac7360 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentEnchantment.java +++ b/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 enchantments = new HashMap(); diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotion.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotion.java index f6dcacc..da91dee 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotion.java +++ b/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 potions = new HashMap(); diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionItem.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionItem.java index e1bc0b5..18adb8d 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionItem.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionMob.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionMob.java index 7aa5a25..90e66e0 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionMob.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java index ac13e77..86ad7e7 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java +++ b/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 implements IBuilderComponent { private final Function serializer; diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/EffectNBT.java b/src/main/java/exopandora/worldhandler/builder/component/impl/EffectNBT.java index 15012cb..b37bca9 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/EffectNBT.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/EntityNBT.java b/src/main/java/exopandora/worldhandler/builder/component/impl/EntityNBT.java index f6528d9..089d3db 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/EntityNBT.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java index f082c88..5c637a7 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderBlockPos.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderBlockPos.java index c2cc2e4..7069abf 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderBlockPos.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderButcher.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderButcher.java index c094ff0..3f641cc 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderButcher.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java index 249d250..12150b5 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderCustomItem.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderCustomItem.java index 3af61d7..afa439a 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderCustomItem.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java index 76ca92d..82db06d 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderDifficulty.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderDifficulty.java index 446af71..ca57b49 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderDifficulty.java +++ b/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() diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java index fcda151..47b05e5 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java +++ b/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() diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderEnchantment.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderEnchantment.java index b1e5613..c87f425 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderEnchantment.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderEntity.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderEntity.java index d13dac4..78215fa 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderEntity.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderExecute.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderExecute.java index 845de7a..c98db46 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderExecute.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java index 95e2a7b..07452af 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java index 1a32b4c..dbd8560 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGamemode.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderGamemode.java index 1bfc751..fc6f1de 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGamemode.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGamerule.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderGamerule.java index fda89e7..a124419 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGamerule.java +++ b/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() diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGeneric.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderGeneric.java index fc1d8a2..e92f897 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGeneric.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java index 0e82b33..5faed92 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderMultiCommand.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderMultiCommand.java index 19ba225..a6f4bba 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderMultiCommand.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderNoteEditor.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderNoteEditor.java index 3ede5f7..861135d 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderNoteEditor.java +++ b/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() diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayer.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayer.java index cbbd656..770f409 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayer.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayerReason.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayerReason.java index c86debb..55e9e8a 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayerReason.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionEffect.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionEffect.java index d9f8847..c436f13 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionEffect.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionItem.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionItem.java index c33b5ed..fcf347d 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionItem.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java index 9e766e9..cb77994 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboard.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboard.java index 4c52b9f..1f1e7f6 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboard.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java index b5a9768..190252e 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardPlayers.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardPlayers.java index de95975..277375f 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardPlayers.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSetBlock.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSetBlock.java index 6f97899..2826229 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSetBlock.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java index c532810..8f9e9e8 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java +++ b/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") diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java index 42b378f..9fffcbc 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java +++ b/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() diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java index 406d69a..ea70077 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java +++ b/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() diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTag.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderTag.java index 5630853..9a430cc 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTag.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTeams.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderTeams.java index 25a5dc9..ce71f58 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTeams.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTime.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderTime.java index c81526a..480998e 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTime.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java index 5246f35..94e429b 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderUsercontent.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderUsercontent.java index c8b6a21..5ece890 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderUsercontent.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWH.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderWH.java index b388c48..f428726 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWH.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWeather.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderWeather.java index 6711c4d..6b23ebb 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWeather.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWhitelist.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderWhitelist.java index d160419..10bc18f 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWhitelist.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWorldHandler.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderWorldHandler.java index 70f8ea5..6d2a3fa 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderWorldHandler.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/builder/types/ArgumentType.java b/src/main/java/exopandora/worldhandler/builder/types/ArgumentType.java index b8e0f1c..3978ee8 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/ArgumentType.java +++ b/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), diff --git a/src/main/java/exopandora/worldhandler/builder/types/BlockResourceLocation.java b/src/main/java/exopandora/worldhandler/builder/types/BlockResourceLocation.java index e58a46a..7f80dad 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/BlockResourceLocation.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java b/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java index 65a727d..98e486c 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java +++ b/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 implements ICoordinate { protected T value; @@ -69,7 +65,6 @@ public abstract class Coordinate implements ICoordinate return coordiante; } - @OnlyIn(Dist.CLIENT) public static enum EnumType { /** diff --git a/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java b/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java index a3a7c1f..762fcb8 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java +++ b/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 { public CoordinateDouble() diff --git a/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java b/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java index 681330a..2ef86de 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java +++ b/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 { public CoordinateInt() diff --git a/src/main/java/exopandora/worldhandler/builder/types/GreedyString.java b/src/main/java/exopandora/worldhandler/builder/types/GreedyString.java index 812fe21..99a4e1d 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/GreedyString.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/types/ICoordinate.java b/src/main/java/exopandora/worldhandler/builder/types/ICoordinate.java index 22ac96b..85fe1aa 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/ICoordinate.java +++ b/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 zero(); diff --git a/src/main/java/exopandora/worldhandler/builder/types/ItemResourceLocation.java b/src/main/java/exopandora/worldhandler/builder/types/ItemResourceLocation.java index 4aaf6f1..4c87acb 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/ItemResourceLocation.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/builder/types/TargetSelector.java b/src/main/java/exopandora/worldhandler/builder/types/TargetSelector.java index c1b47f5..ce7b7d8 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/TargetSelector.java +++ b/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 values = new HashMap(); diff --git a/src/main/java/exopandora/worldhandler/config/Config.java b/src/main/java/exopandora/worldhandler/config/Config.java index df67edc..b8b22f0 100644 --- a/src/main/java/exopandora/worldhandler/config/Config.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/config/ConfigCategoryButcher.java b/src/main/java/exopandora/worldhandler/config/ConfigCategoryButcher.java index 723ecfe..5ad4d8e 100644 --- a/src/main/java/exopandora/worldhandler/config/ConfigCategoryButcher.java +++ b/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> entities; diff --git a/src/main/java/exopandora/worldhandler/config/ConfigCategorySettings.java b/src/main/java/exopandora/worldhandler/config/ConfigCategorySettings.java index 386e20c..9277d79 100644 --- a/src/main/java/exopandora/worldhandler/config/ConfigCategorySettings.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/config/ConfigCategorySkin.java b/src/main/java/exopandora/worldhandler/config/ConfigCategorySkin.java index 2991767..9d79e1c 100644 --- a/src/main/java/exopandora/worldhandler/config/ConfigCategorySkin.java +++ b/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 iconSize; @@ -275,7 +272,6 @@ public class ConfigCategorySkin Config.set(this.buttonAlpha, alpha); } - @OnlyIn(Dist.CLIENT) public static enum EnumIconSize { x16, diff --git a/src/main/java/exopandora/worldhandler/config/ConfigCategorySliders.java b/src/main/java/exopandora/worldhandler/config/ConfigCategorySliders.java index d53eb0d..a23ee68 100644 --- a/src/main/java/exopandora/worldhandler/config/ConfigCategorySliders.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java index 554c45e..bad9808 100644 --- a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/event/KeyHandler.java b/src/main/java/exopandora/worldhandler/event/KeyHandler.java index 0f45c5d..24411df 100644 --- a/src/main/java/exopandora/worldhandler/event/KeyHandler.java +++ b/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"); diff --git a/src/main/java/exopandora/worldhandler/gui/DummyScreen.java b/src/main/java/exopandora/worldhandler/gui/DummyScreen.java index 7273323..e2468f2 100644 --- a/src/main/java/exopandora/worldhandler/gui/DummyScreen.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/category/Categories.java b/src/main/java/exopandora/worldhandler/gui/category/Categories.java index 059b9ff..e131db8 100644 --- a/src/main/java/exopandora/worldhandler/gui/category/Categories.java +++ b/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"); diff --git a/src/main/java/exopandora/worldhandler/gui/category/Category.java b/src/main/java/exopandora/worldhandler/gui/category/Category.java index 8048e1a..9efcc77 100644 --- a/src/main/java/exopandora/worldhandler/gui/category/Category.java +++ b/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 { public static IForgeRegistry REGISTRY; diff --git a/src/main/java/exopandora/worldhandler/gui/container/Container.java b/src/main/java/exopandora/worldhandler/gui/container/Container.java index 0d1d2ef..83b6369 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/Container.java +++ b/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 menus = new ArrayList(); diff --git a/src/main/java/exopandora/worldhandler/gui/container/IContainer.java b/src/main/java/exopandora/worldhandler/gui/container/IContainer.java index 2e96bbe..e90d458 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/IContainer.java +++ b/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 add(T button); diff --git a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java index 6d4c09c..5946fda 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/Content.java b/src/main/java/exopandora/worldhandler/gui/content/Content.java index 1e475b1..5c0d097 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/Content.java +++ b/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 implements IContent { public static IForgeRegistry REGISTRY; diff --git a/src/main/java/exopandora/worldhandler/gui/content/Contents.java b/src/main/java/exopandora/worldhandler/gui/content/Contents.java index 13ad260..b4a3c69 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/Contents.java +++ b/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"); diff --git a/src/main/java/exopandora/worldhandler/gui/content/IContent.java b/src/main/java/exopandora/worldhandler/gui/content/IContent.java index 3a4732e..b0088c6 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/IContent.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java index c66c7ab..273d7d8 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java +++ b/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]); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java index 2126177..abc7242 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherPresets.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherPresets.java index 8a824a4..614cf8a 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherPresets.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java index 033d1d2..e052284 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java index e279b10..2570765 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChild.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChild.java index da382d3..2a6d186 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChild.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCommandStack.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCommandStack.java index 1f46ea4..0422d82 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCommandStack.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java index 56db2e4..cadcc6d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java index 1f1051c..3dd88ba 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java index 71bd754..fa125ab 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java index fbcdc92..9e1fc59 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java +++ b/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, diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java index 98c0d01..6ce24af 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java index 3bb89e9..20894c7 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java +++ b/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(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java index 3fa67f4..3ff4b09 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java +++ b/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; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java index 31612bf..4eaec0e 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java +++ b/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 diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java index ead3427..4738c3a 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java +++ b/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), diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java index 1abae13..4ef7b16 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java @@ -32,10 +32,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.NoteBlock; 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 ContentNoteEditor extends Content { private static final ResourceLocation NOTE = new ResourceLocation(Main.MODID, "textures/misc/note.png"); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java index a76ea05..169686d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java @@ -25,10 +25,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.player.Player; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ContentPlayer extends Content { private Page page = Page.START; @@ -229,7 +226,6 @@ public class ContentPlayer extends Content return Contents.PLAYER; } - @OnlyIn(Dist.CLIENT) public static enum Page { START, diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java index 79a5f3b..42616a4 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java @@ -23,11 +23,8 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.item.Items; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; -@OnlyIn(Dist.CLIENT) public class ContentPotions extends ContentChild { private int potionPage; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java index 314189f..aeeeaf1 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java @@ -24,10 +24,7 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ContentRecipes extends Content { private final BuilderRecipe builderRecipe = new BuilderRecipe(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java index 336f918..90108c9 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboard.java @@ -6,10 +6,7 @@ import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.util.ScoreboardHelper; 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 abstract class ContentScoreboard extends Content { protected static final ScoreboardHelper HELPER = new ScoreboardHelper(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java index 1a90edc..69583a0 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java @@ -29,12 +29,9 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.stats.StatType; import net.minecraft.stats.Stats; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; -@OnlyIn(Dist.CLIENT) public class ContentScoreboardObjectives extends ContentScoreboard { private GuiTextFieldTooltip objectField; @@ -295,7 +292,6 @@ public class ContentScoreboardObjectives extends ContentScoreboard return Contents.SCOREBOARD_OBJECTIVES; } - @OnlyIn(Dist.CLIENT) public static enum Page { CREATE(0), diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java index 082fcfe..e823c72 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java @@ -22,10 +22,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 ContentScoreboardPlayers extends ContentScoreboard { private GuiTextFieldTooltip objectField; @@ -279,7 +276,6 @@ public class ContentScoreboardPlayers extends ContentScoreboard this.builderTag.setPlayer(username); } - @OnlyIn(Dist.CLIENT) public static enum Page { ADD_SET_REMOVE("add|set|remove"), diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java index 7afbfd3..1f305da 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java @@ -23,10 +23,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 ContentScoreboardTeams extends ContentScoreboard { private GuiTextFieldTooltip teamField; @@ -234,7 +231,6 @@ public class ContentScoreboardTeams extends ContentScoreboard } } - @OnlyIn(Dist.CLIENT) public static enum Page { ADD(EnumMode.ADD, 24), diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java index 9245783..aae98c7 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java @@ -20,10 +20,7 @@ import exopandora.worldhandler.util.ActionHandler; import exopandora.worldhandler.util.ActionHelper; 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 ContentSettings extends ContentChild { private static final List> SETTINGS = new ArrayList>(); @@ -217,7 +214,6 @@ public class ContentSettings extends ContentChild this.setter.accept(value); } - @OnlyIn(Dist.CLIENT) public static class BooleanSetting extends Setting { public BooleanSetting(String key, Supplier getter, Consumer setter) @@ -226,7 +222,6 @@ public class ContentSettings extends ContentChild } } - @OnlyIn(Dist.CLIENT) public static class IntegerSetting extends Setting { public IntegerSetting(String key, Supplier getter, Consumer setter) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java index 7eb08bb..ebe974c 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java @@ -28,10 +28,7 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.SignBlock; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ContentSignEditor extends Content { private int selectedLine = 0; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java index 3cd253b..628fa16 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java @@ -45,11 +45,8 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; -@OnlyIn(Dist.CLIENT) public class ContentSummon extends Content { private static final ResourceLocation BEACON_LOCATION = new ResourceLocation("textures/gui/container/beacon.png"); @@ -500,7 +497,6 @@ public class ContentSummon extends Content return Contents.SUMMON; } - @OnlyIn(Dist.CLIENT) public static enum Page { START, diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java index 5b78798..92cfd3c 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java @@ -44,10 +44,7 @@ import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ContentUsercontent extends Content { private final String id; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java index 114e503..aa0e54d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java @@ -19,10 +19,7 @@ import net.minecraft.client.server.IntegratedServer; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ContentWorldInfo extends Content { private Page page = Page.START; @@ -209,7 +206,6 @@ public class ContentWorldInfo extends Content return Contents.WORLD_INFO; } - @OnlyIn(Dist.CLIENT) public static enum Page { START, diff --git a/src/main/java/exopandora/worldhandler/gui/menu/IMenu.java b/src/main/java/exopandora/worldhandler/gui/menu/IMenu.java index 7341e88..92f914b 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/IMenu.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/IMenu.java @@ -3,10 +3,7 @@ package exopandora.worldhandler.gui.menu; import com.mojang.blaze3d.vertex.PoseStack; import exopandora.worldhandler.gui.container.Container; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IMenu { void initGui(Container container); diff --git a/src/main/java/exopandora/worldhandler/gui/menu/Menu.java b/src/main/java/exopandora/worldhandler/gui/menu/Menu.java index 2a12ce4..3bdae0e 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/Menu.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/Menu.java @@ -1,9 +1,5 @@ package exopandora.worldhandler.gui.menu; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public abstract class Menu implements IMenu { protected int x; diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java index 6a7aed7..0377712 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicButtonList.java @@ -4,10 +4,7 @@ import java.util.List; import exopandora.worldhandler.util.ILogic; import net.minecraft.network.chat.MutableComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface ILogicButtonList extends ILogic { MutableComponent translate(String key, int depth); diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java index 030e63f..1002385 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicColorMenu.java @@ -1,10 +1,7 @@ package exopandora.worldhandler.gui.menu.impl; import exopandora.worldhandler.util.ILogic; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface ILogicColorMenu extends ILogic { default boolean validate(String text) diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java index 5cac3d5..0f95b90 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicMapped.java @@ -3,10 +3,7 @@ package exopandora.worldhandler.gui.menu.impl; import exopandora.worldhandler.util.ILogic; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface ILogicMapped extends ILogic { MutableComponent translate(T item); diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java index 19b9ca3..99efed0 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/ILogicPageList.java @@ -3,10 +3,7 @@ package exopandora.worldhandler.gui.menu.impl; import exopandora.worldhandler.gui.widget.button.GuiButtonBase; import exopandora.worldhandler.util.ActionHandler; import net.minecraft.network.chat.MutableComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface ILogicPageList extends ILogicMapped { GuiButtonBase onRegister(int x, int y, int width, int height, MutableComponent text, T item, ActionHandler actionHandler); diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java index c2d381d..f25c7a3 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java @@ -17,10 +17,7 @@ import exopandora.worldhandler.gui.widget.button.GuiButtonList.Persistence; import exopandora.worldhandler.util.Node; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class MenuButtonList extends Menu { private final List items; diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java index 53ff2b2..6a2b8b4 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java @@ -16,10 +16,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; 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 MenuColorField extends Menu { private static final List COLORS = new ArrayList(); diff --git a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java index dabd98e..05107e8 100644 --- a/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java @@ -14,10 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class MenuPageList extends Menu { private final List items; @@ -149,7 +146,6 @@ public class MenuPageList extends Menu return Math.max((int) Math.ceil((float) this.items.size() / this.length), 1); } - @OnlyIn(Dist.CLIENT) public static class Persistence { private int page; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/IContainerWidget.java b/src/main/java/exopandora/worldhandler/gui/widget/IContainerWidget.java index 15c62f0..213d2fe 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/IContainerWidget.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/IContainerWidget.java @@ -1,9 +1,5 @@ package exopandora.worldhandler.gui.widget; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public interface IContainerWidget extends IWidget { default boolean isEnabled() @@ -13,7 +9,6 @@ public interface IContainerWidget extends IWidget EnumLayer getLayer(); - @OnlyIn(Dist.CLIENT) public static enum EnumLayer { BACKGROUND, diff --git a/src/main/java/exopandora/worldhandler/gui/widget/IWidget.java b/src/main/java/exopandora/worldhandler/gui/widget/IWidget.java index cc0aebc..61262b2 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/IWidget.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/IWidget.java @@ -4,10 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import exopandora.worldhandler.gui.container.Container; import net.minecraft.client.gui.components.events.GuiEventListener; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IWidget extends GuiEventListener { default void init(Container container) diff --git a/src/main/java/exopandora/worldhandler/gui/widget/WidgetCommandSyntax.java b/src/main/java/exopandora/worldhandler/gui/widget/WidgetCommandSyntax.java index 977dc0a..72d52a6 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/WidgetCommandSyntax.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/WidgetCommandSyntax.java @@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.impl.BuilderWorldHandler; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.widget.button.GuiTextFieldTooltip; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class WidgetCommandSyntax implements IContainerWidget { private static final BuilderWorldHandler BUILDER_WORLD_HANDLER = new BuilderWorldHandler(); diff --git a/src/main/java/exopandora/worldhandler/gui/widget/WidgetNameField.java b/src/main/java/exopandora/worldhandler/gui/widget/WidgetNameField.java index 23a07d2..cbabd4c 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/WidgetNameField.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/WidgetNameField.java @@ -9,10 +9,7 @@ import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.resources.language.I18n; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class WidgetNameField implements IContainerWidget { private final GuiTextFieldTooltip nameField = Util.make(new GuiTextFieldTooltip(0, 0, 0, 11), textfield -> textfield.setMaxLength(16)); diff --git a/src/main/java/exopandora/worldhandler/gui/widget/WidgetShortcuts.java b/src/main/java/exopandora/worldhandler/gui/widget/WidgetShortcuts.java index 4ac8e7a..167a0fd 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/WidgetShortcuts.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/WidgetShortcuts.java @@ -10,10 +10,7 @@ import exopandora.worldhandler.util.ActionHandler; import exopandora.worldhandler.util.ActionHelper; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class WidgetShortcuts implements IContainerWidget { @Override @@ -41,7 +38,6 @@ public class WidgetShortcuts implements IContainerWidget return EnumLayer.FOREGROUND; } - @OnlyIn(Dist.CLIENT) public static enum EnumShortcuts { TIME_DAWN(EnumIcon.TIME_DAWN, ActionHelper::timeDawn, () -> diff --git a/src/main/java/exopandora/worldhandler/gui/widget/WidgetTabRenderer.java b/src/main/java/exopandora/worldhandler/gui/widget/WidgetTabRenderer.java index b533f7d..b02ffee 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/WidgetTabRenderer.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/WidgetTabRenderer.java @@ -16,10 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiComponent; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class WidgetTabRenderer implements IContainerWidget { private static final int SPACING = 2; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/WidgetWatch.java b/src/main/java/exopandora/worldhandler/gui/widget/WidgetWatch.java index 4ce6d7c..8200a56 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/WidgetWatch.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/WidgetWatch.java @@ -8,10 +8,7 @@ import exopandora.worldhandler.util.RenderUtils; import exopandora.worldhandler.util.TextUtils; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class WidgetWatch implements IContainerWidget { @Override diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/EnumIcon.java b/src/main/java/exopandora/worldhandler/gui/widget/button/EnumIcon.java index 50e2aa7..7e05c80 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/EnumIcon.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/EnumIcon.java @@ -1,9 +1,5 @@ package exopandora.worldhandler.gui.widget.button; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public enum EnumIcon { WEATHER_SUN(0, 0), diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonBase.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonBase.java index 44f6917..30a7019 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonBase.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonBase.java @@ -13,10 +13,7 @@ import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiButtonBase extends Button { public GuiButtonBase(int x, int y, int widthIn, int heightIn, String translationKey, ActionHandler actionHandler) diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonIcon.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonIcon.java index 3d6037c..6baf497 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonIcon.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonIcon.java @@ -7,10 +7,7 @@ import exopandora.worldhandler.util.ActionHandler; import exopandora.worldhandler.util.ResourceHelper; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiButtonIcon extends GuiButtonTooltip { private final EnumIcon icon; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonItem.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonItem.java index ddd9e87..c8a0994 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonItem.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonItem.java @@ -6,10 +6,7 @@ import exopandora.worldhandler.util.ActionHandler; import net.minecraft.client.Minecraft; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiButtonItem extends GuiButtonBase { private final ItemStack stack; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonList.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonList.java index af7323a..b4e6332 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonList.java @@ -14,10 +14,7 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiButtonList extends GuiButtonTooltip { private final ILogicMapped logic; @@ -151,7 +148,6 @@ public class GuiButtonList extends GuiButtonTooltip return mouseY >= this.y && mouseY < this.y + this.height; } - @OnlyIn(Dist.CLIENT) public static class Persistence { private int index; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonPiano.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonPiano.java index 48eb11f..ecf5fe4 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonPiano.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonPiano.java @@ -13,10 +13,7 @@ import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiButtonPiano extends GuiButtonBase { private static final ResourceLocation NOTE = new ResourceLocation(Main.MODID, "textures/misc/note.png"); @@ -157,7 +154,6 @@ public class GuiButtonPiano extends GuiButtonBase return this.isMouseOver(mouseX, mouseY); } - @OnlyIn(Dist.CLIENT) public static enum Type { LEFT, diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTab.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTab.java index 271bad6..97fd0dd 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTab.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTab.java @@ -5,10 +5,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import exopandora.worldhandler.util.ActionHandler; import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.Component; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiButtonTab extends GuiButtonBase { public GuiButtonTab(int x, int y, int widthIn, int heightIn, Component narration, ActionHandler actionHandler) diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTooltip.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTooltip.java index c18219c..dcafc61 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTooltip.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTooltip.java @@ -5,10 +5,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import exopandora.worldhandler.util.ActionHandler; 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 class GuiButtonTooltip extends GuiButtonBase { protected Component tooltip; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiSlider.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiSlider.java index 544f55e..067e69c 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiSlider.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiSlider.java @@ -14,10 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiSlider extends GuiButtonBase { private final Persistence persistence; @@ -98,7 +95,6 @@ public class GuiSlider extends GuiButtonBase this.setMessage(text); } - @OnlyIn(Dist.CLIENT) public static interface ILogicSlider extends ILogic { MutableComponent formatPrefix(int value); @@ -108,7 +104,6 @@ public class GuiSlider extends GuiButtonBase void onChangeSliderValue(int value); } - @OnlyIn(Dist.CLIENT) public class Persistence { private double min; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiTextFieldTooltip.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiTextFieldTooltip.java index ef84822..d08d8c5 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/GuiTextFieldTooltip.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiTextFieldTooltip.java @@ -6,10 +6,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class GuiTextFieldTooltip extends EditBox { private Component tooltip; diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderAttribute.java b/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderAttribute.java index 6f8ef59..efabe5b 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderAttribute.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderAttribute.java @@ -5,10 +5,7 @@ import java.util.function.Consumer; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; 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 LogicSliderAttribute extends LogicSliderSimple { public LogicSliderAttribute(Attribute attribute, MutableComponent text, Consumer listener) diff --git a/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderSimple.java b/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderSimple.java index bf97ee5..ca1854b 100644 --- a/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderSimple.java +++ b/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderSimple.java @@ -5,10 +5,7 @@ import java.util.function.Consumer; import exopandora.worldhandler.gui.widget.button.GuiSlider.ILogicSlider; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class LogicSliderSimple implements ILogicSlider { private final String id; diff --git a/src/main/java/exopandora/worldhandler/usercontent/ScriptEngineAdapter.java b/src/main/java/exopandora/worldhandler/usercontent/ScriptEngineAdapter.java index 6cd954b..3b83587 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/ScriptEngineAdapter.java +++ b/src/main/java/exopandora/worldhandler/usercontent/ScriptEngineAdapter.java @@ -6,10 +6,7 @@ import javax.script.ScriptEngine; import javax.script.ScriptException; import exopandora.worldhandler.WorldHandler; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ScriptEngineAdapter { private final ScriptEngine engine; diff --git a/src/main/java/exopandora/worldhandler/usercontent/UsercontentAPI.java b/src/main/java/exopandora/worldhandler/usercontent/UsercontentAPI.java index 4ef0840..3299fe1 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/UsercontentAPI.java +++ b/src/main/java/exopandora/worldhandler/usercontent/UsercontentAPI.java @@ -11,10 +11,7 @@ import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class UsercontentAPI { private final Map values = new HashMap(); diff --git a/src/main/java/exopandora/worldhandler/usercontent/UsercontentConfig.java b/src/main/java/exopandora/worldhandler/usercontent/UsercontentConfig.java index 9df280c..f411123 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/UsercontentConfig.java +++ b/src/main/java/exopandora/worldhandler/usercontent/UsercontentConfig.java @@ -5,10 +5,7 @@ import java.nio.file.Path; import javax.script.ScriptEngine; import exopandora.worldhandler.usercontent.model.JsonUsercontent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class UsercontentConfig { private final String id; @@ -44,7 +41,6 @@ public class UsercontentConfig return this.engine; } - @OnlyIn(Dist.CLIENT) public static class Builder { private final String id; diff --git a/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java b/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java index 3d0c4d6..3c5d1af 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java +++ b/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java @@ -32,10 +32,7 @@ import exopandora.worldhandler.usercontent.model.JsonMenu; import exopandora.worldhandler.usercontent.model.JsonUsercontent; import exopandora.worldhandler.usercontent.model.JsonWidget; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class UsercontentLoader { public static final List CONFIGS = new ArrayList(); @@ -164,7 +161,6 @@ public class UsercontentLoader return valid; } - @OnlyIn(Dist.CLIENT) public static class EnumTypeAdapter> extends TypeAdapter { private final Class klass; diff --git a/src/main/java/exopandora/worldhandler/usercontent/VisibleActiveObject.java b/src/main/java/exopandora/worldhandler/usercontent/VisibleActiveObject.java index 1bd0aca..1485b6e 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/VisibleActiveObject.java +++ b/src/main/java/exopandora/worldhandler/usercontent/VisibleActiveObject.java @@ -2,10 +2,7 @@ package exopandora.worldhandler.usercontent; import exopandora.worldhandler.usercontent.model.BooleanExpression; import exopandora.worldhandler.usercontent.model.JsonWidget; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class VisibleActiveObject extends VisibleObject { private final BooleanExpression active; diff --git a/src/main/java/exopandora/worldhandler/usercontent/VisibleObject.java b/src/main/java/exopandora/worldhandler/usercontent/VisibleObject.java index f7d92ed..5e39f90 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/VisibleObject.java +++ b/src/main/java/exopandora/worldhandler/usercontent/VisibleObject.java @@ -1,10 +1,7 @@ package exopandora.worldhandler.usercontent; import exopandora.worldhandler.usercontent.model.BooleanExpression; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class VisibleObject { private final BooleanExpression visible; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/AbstractWidgetFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/AbstractWidgetFactory.java index bfff74a..08aa530 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/AbstractWidgetFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/AbstractWidgetFactory.java @@ -12,10 +12,7 @@ import exopandora.worldhandler.util.ActionHandler; 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 abstract class AbstractWidgetFactory { private final ActionHandlerFactory actionHandlerFactory; @@ -37,7 +34,6 @@ public abstract class AbstractWidgetFactory return this.api; } - @OnlyIn(Dist.CLIENT) public static class UsercontentLogicMapped> implements ILogicMapped { private final ActionHandlerFactory actionHandlerFactory; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java index 36538c0..1b3c630 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/ActionHandlerFactory.java @@ -17,10 +17,7 @@ import exopandora.worldhandler.usercontent.model.Action; import exopandora.worldhandler.util.ActionHandler; import exopandora.worldhandler.util.ActionHelper; import exopandora.worldhandler.util.CommandHelper; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ActionHandlerFactory { private final UsercontentAPI api; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java index 7375bea..6ae62c3 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java @@ -17,10 +17,7 @@ import exopandora.worldhandler.usercontent.model.JsonItem; import exopandora.worldhandler.usercontent.model.JsonMenu; import exopandora.worldhandler.util.ActionHandler; import net.minecraft.network.chat.MutableComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class MenuFactory extends AbstractWidgetFactory { public MenuFactory(UsercontentAPI api, ActionHandlerFactory actionHandlerFactory) @@ -49,7 +46,6 @@ public class MenuFactory extends AbstractWidgetFactory return null; } - @OnlyIn(Dist.CLIENT) public static class UsercontentLogicPageList> extends UsercontentLogicMapped implements ILogicPageList { private final Container container; diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java index 763d780..8371d2b 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java @@ -21,11 +21,8 @@ import exopandora.worldhandler.usercontent.model.JsonWidget; import exopandora.worldhandler.util.TextUtils; import net.minecraft.client.gui.components.AbstractWidget; 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 WidgetFactory extends AbstractWidgetFactory { public WidgetFactory(UsercontentAPI api, ActionHandlerFactory actionHandlerFactory) diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/AbstractJsonWidget.java b/src/main/java/exopandora/worldhandler/usercontent/model/AbstractJsonWidget.java index f5c8772..b93ac4c 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/AbstractJsonWidget.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/AbstractJsonWidget.java @@ -4,10 +4,6 @@ import java.util.Arrays; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public abstract class AbstractJsonWidget> { @SerializedName("action") @@ -73,7 +69,6 @@ public abstract class AbstractJsonWidget> } } - @OnlyIn(Dist.CLIENT) public static enum Type { BUTTON, diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/Action.java b/src/main/java/exopandora/worldhandler/usercontent/model/Action.java index 1e472da..94efadb 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/Action.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/Action.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class Action { @SerializedName("type") @@ -85,7 +81,6 @@ public class Action } } - @OnlyIn(Dist.CLIENT) public static enum Type { OPEN, diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/ActionAttributes.java b/src/main/java/exopandora/worldhandler/usercontent/model/ActionAttributes.java index 8648993..6b2c38f 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/ActionAttributes.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/ActionAttributes.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class ActionAttributes { @SerializedName("function") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/Attributes.java b/src/main/java/exopandora/worldhandler/usercontent/model/Attributes.java index b68d489..3040dcc 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/Attributes.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/Attributes.java @@ -5,10 +5,7 @@ import java.util.List; import com.google.gson.annotations.SerializedName; import exopandora.worldhandler.gui.widget.button.EnumIcon; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class Attributes { @SerializedName("id") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/BooleanExpression.java b/src/main/java/exopandora/worldhandler/usercontent/model/BooleanExpression.java index 125c593..2001996 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/BooleanExpression.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/BooleanExpression.java @@ -3,10 +3,7 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; import exopandora.worldhandler.usercontent.ScriptEngineAdapter; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class BooleanExpression { @SerializedName("type") @@ -74,7 +71,6 @@ public class BooleanExpression return true; } - @OnlyIn(Dist.CLIENT) public static enum Type { BOOL, diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonCommand.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonCommand.java index d6dcd56..0e5b67a 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonCommand.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonCommand.java @@ -5,10 +5,7 @@ import java.util.List; import com.google.gson.annotations.SerializedName; import exopandora.worldhandler.builder.CommandSyntax.Argument; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class JsonCommand { @SerializedName("name") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java index 728df5a..b6e118e 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java @@ -4,10 +4,6 @@ import java.util.List; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonGui { @SerializedName("title") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonItem.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonItem.java index 3f04c99..065c577 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonItem.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonItem.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonItem { @SerializedName("id") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonLabel.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonLabel.java index fbf9494..1848d93 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonLabel.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonLabel.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonLabel { @SerializedName("text") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonLayout.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonLayout.java index 2627b67..fa09da7 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonLayout.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonLayout.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonLayout { @SerializedName("x") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java index 2fb7ab7..e6c7579 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java @@ -3,10 +3,7 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; import exopandora.worldhandler.usercontent.model.JsonMenu.Type; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class JsonMenu extends AbstractJsonWidget { @SerializedName("type") @@ -28,7 +25,6 @@ public class JsonMenu extends AbstractJsonWidget this.type = type; } - @OnlyIn(Dist.CLIENT) public static enum Type { PAGE_LIST; diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonModel.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonModel.java index 0b71789..3a8ada5 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonModel.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonModel.java @@ -4,10 +4,6 @@ import java.util.List; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonModel { @SerializedName("commands") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonTab.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonTab.java index a7be4b1..29d3f1b 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonTab.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonTab.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonTab { @SerializedName("title") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonUsercontent.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonUsercontent.java index 49134c5..e50b304 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonUsercontent.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonUsercontent.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class JsonUsercontent { @SerializedName("model") diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonWidget.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonWidget.java index e3527af..6be2ef0 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonWidget.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonWidget.java @@ -3,10 +3,7 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; import exopandora.worldhandler.usercontent.model.JsonWidget.Type; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class JsonWidget extends AbstractJsonWidget { @SerializedName("text") @@ -121,7 +118,6 @@ public class JsonWidget extends AbstractJsonWidget } } - @OnlyIn(Dist.CLIENT) public static enum Type { BUTTON, diff --git a/src/main/java/exopandora/worldhandler/util/ActionHandler.java b/src/main/java/exopandora/worldhandler/util/ActionHandler.java index 4a91abb..f5e6ca8 100644 --- a/src/main/java/exopandora/worldhandler/util/ActionHandler.java +++ b/src/main/java/exopandora/worldhandler/util/ActionHandler.java @@ -1,10 +1,6 @@ package exopandora.worldhandler.util; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - @FunctionalInterface -@OnlyIn(Dist.CLIENT) public interface ActionHandler { void run() throws Exception; diff --git a/src/main/java/exopandora/worldhandler/util/ActionHelper.java b/src/main/java/exopandora/worldhandler/util/ActionHelper.java index 64e9d1e..6af2972 100644 --- a/src/main/java/exopandora/worldhandler/util/ActionHelper.java +++ b/src/main/java/exopandora/worldhandler/util/ActionHelper.java @@ -25,10 +25,7 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.Difficulty; import net.minecraft.world.level.block.NoteBlock; import net.minecraft.world.level.block.SignBlock; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class ActionHelper { public static void backToGame() diff --git a/src/main/java/exopandora/worldhandler/util/AdvancementHelper.java b/src/main/java/exopandora/worldhandler/util/AdvancementHelper.java index 22f62b9..6fc92d7 100644 --- a/src/main/java/exopandora/worldhandler/util/AdvancementHelper.java +++ b/src/main/java/exopandora/worldhandler/util/AdvancementHelper.java @@ -18,10 +18,7 @@ import net.minecraft.server.packs.resources.SimpleReloadableResourceManager; import net.minecraft.util.Unit; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.level.storage.loot.PredicateManager; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class AdvancementHelper implements PreparableReloadListener { private static final AdvancementHelper INSTANCE = new AdvancementHelper(); diff --git a/src/main/java/exopandora/worldhandler/util/BlockHelper.java b/src/main/java/exopandora/worldhandler/util/BlockHelper.java index 07d0646..e6f8b28 100644 --- a/src/main/java/exopandora/worldhandler/util/BlockHelper.java +++ b/src/main/java/exopandora/worldhandler/util/BlockHelper.java @@ -29,10 +29,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class BlockHelper { private static BlockPos pos1 = BlockPos.ZERO; diff --git a/src/main/java/exopandora/worldhandler/util/CommandHelper.java b/src/main/java/exopandora/worldhandler/util/CommandHelper.java index 28df91b..171d617 100644 --- a/src/main/java/exopandora/worldhandler/util/CommandHelper.java +++ b/src/main/java/exopandora/worldhandler/util/CommandHelper.java @@ -10,8 +10,6 @@ import exopandora.worldhandler.command.CommandWorldHandler; import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.TextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public class CommandHelper { @@ -36,13 +34,11 @@ public class CommandHelper CommandWH.register(dispatcher); } - @OnlyIn(Dist.CLIENT) public static void sendCommand(String player, ICommandBuilder builder) { CommandHelper.sendCommand(player, builder, false); } - @OnlyIn(Dist.CLIENT) public static void sendCommand(String player, ICommandBuilder builder, boolean special) { if(builder != null) diff --git a/src/main/java/exopandora/worldhandler/util/EnumHelper.java b/src/main/java/exopandora/worldhandler/util/EnumHelper.java index 61eb156..0b07e0a 100644 --- a/src/main/java/exopandora/worldhandler/util/EnumHelper.java +++ b/src/main/java/exopandora/worldhandler/util/EnumHelper.java @@ -2,10 +2,6 @@ package exopandora.worldhandler.util; import javax.annotation.Nullable; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class EnumHelper { @Nullable diff --git a/src/main/java/exopandora/worldhandler/util/IConnection.java b/src/main/java/exopandora/worldhandler/util/IConnection.java index 005d54b..ec48f27 100644 --- a/src/main/java/exopandora/worldhandler/util/IConnection.java +++ b/src/main/java/exopandora/worldhandler/util/IConnection.java @@ -3,12 +3,9 @@ package exopandora.worldhandler.util; import net.minecraft.client.multiplayer.ServerData; 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; public interface IConnection { - @OnlyIn(Dist.CLIENT) public static class IntegratedConnection implements IConnection { private final String folder; @@ -38,7 +35,6 @@ public interface IConnection } } - @OnlyIn(Dist.CLIENT) public static class DedicatedConnection implements IConnection { private final ServerData data; diff --git a/src/main/java/exopandora/worldhandler/util/ILogic.java b/src/main/java/exopandora/worldhandler/util/ILogic.java index 7fd673c..eb13fe8 100644 --- a/src/main/java/exopandora/worldhandler/util/ILogic.java +++ b/src/main/java/exopandora/worldhandler/util/ILogic.java @@ -1,9 +1,5 @@ package exopandora.worldhandler.util; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public interface ILogic { String getId(); diff --git a/src/main/java/exopandora/worldhandler/util/MutableTextComponent.java b/src/main/java/exopandora/worldhandler/util/MutableTextComponent.java index 27b6338..4eceb5f 100644 --- a/src/main/java/exopandora/worldhandler/util/MutableTextComponent.java +++ b/src/main/java/exopandora/worldhandler/util/MutableTextComponent.java @@ -7,10 +7,7 @@ import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; import net.minecraft.util.FormattedCharSequence; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class MutableTextComponent extends TextComponent implements INBTWritable { public MutableTextComponent() diff --git a/src/main/java/exopandora/worldhandler/util/NBTHelper.java b/src/main/java/exopandora/worldhandler/util/NBTHelper.java index b5b200e..418c127 100644 --- a/src/main/java/exopandora/worldhandler/util/NBTHelper.java +++ b/src/main/java/exopandora/worldhandler/util/NBTHelper.java @@ -15,10 +15,7 @@ import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; 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 NBTHelper { public static Tag serialize(BlockState blockState) diff --git a/src/main/java/exopandora/worldhandler/util/Node.java b/src/main/java/exopandora/worldhandler/util/Node.java index 4348e71..3ef5804 100644 --- a/src/main/java/exopandora/worldhandler/util/Node.java +++ b/src/main/java/exopandora/worldhandler/util/Node.java @@ -10,10 +10,6 @@ import java.util.function.BiPredicate; import javax.annotation.Nullable; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public class Node { private final String key; diff --git a/src/main/java/exopandora/worldhandler/util/RegistryHelper.java b/src/main/java/exopandora/worldhandler/util/RegistryHelper.java index 4d4e27e..b2aaba3 100644 --- a/src/main/java/exopandora/worldhandler/util/RegistryHelper.java +++ b/src/main/java/exopandora/worldhandler/util/RegistryHelper.java @@ -17,14 +17,11 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistryEntry; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; -@OnlyIn(Dist.CLIENT) public class RegistryHelper { private static final Map, Function, String>> FORGE = new HashMap, Function, String>>(); diff --git a/src/main/java/exopandora/worldhandler/util/RenderUtils.java b/src/main/java/exopandora/worldhandler/util/RenderUtils.java index 060168f..fc1b267 100644 --- a/src/main/java/exopandora/worldhandler/util/RenderUtils.java +++ b/src/main/java/exopandora/worldhandler/util/RenderUtils.java @@ -6,10 +6,7 @@ import com.mojang.math.Vector3f; import exopandora.worldhandler.config.Config; import net.minecraft.client.gui.GuiComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class RenderUtils { public static void drawWatchIntoGui(PoseStack matrix, GuiComponent gui, int width, int height, long worldTicks, boolean smooth) diff --git a/src/main/java/exopandora/worldhandler/util/ResourceHelper.java b/src/main/java/exopandora/worldhandler/util/ResourceHelper.java index fb8bf08..0c3022d 100644 --- a/src/main/java/exopandora/worldhandler/util/ResourceHelper.java +++ b/src/main/java/exopandora/worldhandler/util/ResourceHelper.java @@ -7,11 +7,8 @@ import exopandora.worldhandler.builder.types.BlockResourceLocation; import exopandora.worldhandler.builder.types.ItemResourceLocation; import exopandora.worldhandler.config.Config; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.IForgeRegistry; -@OnlyIn(Dist.CLIENT) public class ResourceHelper { private static final ResourceLocation BACKGROUND = new ResourceLocation("textures/gui/demo_background.png"); diff --git a/src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java b/src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java index 028e12c..e9c8aa8 100644 --- a/src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java +++ b/src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java @@ -14,11 +14,8 @@ import net.minecraft.stats.Stats; import net.minecraft.world.scores.Team.CollisionRule; import net.minecraft.world.scores.Team.Visibility; import net.minecraft.world.scores.criteria.ObjectiveCriteria; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; -@OnlyIn(Dist.CLIENT) public class ScoreboardHelper { private final Node objectives = new Node(); diff --git a/src/main/java/exopandora/worldhandler/util/SignText.java b/src/main/java/exopandora/worldhandler/util/SignText.java index bee9281..e2ebde2 100644 --- a/src/main/java/exopandora/worldhandler/util/SignText.java +++ b/src/main/java/exopandora/worldhandler/util/SignText.java @@ -7,10 +7,7 @@ import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.ClickEvent.Action; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class SignText implements INBTWritable { private MutableTextComponent text = new MutableTextComponent(); diff --git a/src/main/java/exopandora/worldhandler/util/TextUtils.java b/src/main/java/exopandora/worldhandler/util/TextUtils.java index a65c367..66b4d69 100644 --- a/src/main/java/exopandora/worldhandler/util/TextUtils.java +++ b/src/main/java/exopandora/worldhandler/util/TextUtils.java @@ -6,10 +6,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.util.Mth; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class TextUtils { public static final TextComponent ARROW_LEFT = new TextComponent("<");