MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove distmarker annotations

Browse Source
This commit is contained in:
Marcel Konrad
2021-09-20 21:02:37 +02:00
parent e10832a285
commit 36dadd84a2
183 changed files with 3 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/exopandora/worldhandler/builder/CommandBuilder.java
View File

@@ -19,10 +19,7 @@ import exopandora.worldhandler.builder.types.ItemResourceLocation;
import exopandora.worldhandler.builder.types.TargetSelector; import exopandora.worldhandler.builder.types.TargetSelector;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation; 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 public abstract class CommandBuilder implements ICommandBuilderSyntax
{ {
private List<Entry<Argument, String>> command; private List<Entry<Argument, String>> command;

3
src/main/java/exopandora/worldhandler/builder/CommandBuilderNBT.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/CommandString.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/CommandSyntax.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/ICommandBuilderNBT.java
View File

@@ -1,10 +1,7 @@
package exopandora.worldhandler.builder; package exopandora.worldhandler.builder;
import net.minecraft.nbt.CompoundTag; 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 public interface ICommandBuilderNBT extends ICommandBuilder
{ {
void setNBT(CompoundTag nbt); void setNBT(CompoundTag nbt);

3
src/main/java/exopandora/worldhandler/builder/INBTWritable.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/component/IBuilderComponent.java
View File

@@ -1,10 +1,7 @@
package exopandora.worldhandler.builder.component; package exopandora.worldhandler.builder.component;
import exopandora.worldhandler.builder.INBTWritable; 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 public interface IBuilderComponent extends INBTWritable
{ {
String getTag(); String getTag();

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttribute.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeItem.java
View File

@@ -9,10 +9,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag; import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraft.world.entity.ai.attributes.Attribute; 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 public class ComponentAttributeItem extends ComponentAttribute
{ {
@Override @Override

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentAttributeMob.java
View File

@@ -8,10 +8,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag; import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraft.world.entity.ai.attributes.Attribute; 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 public class ComponentAttributeMob extends ComponentAttribute
{ {
@Override @Override

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentCustom.java
View File

@@ -2,10 +2,7 @@ package exopandora.worldhandler.builder.component.impl;
import exopandora.worldhandler.builder.component.IBuilderComponent; import exopandora.worldhandler.builder.component.IBuilderComponent;
import net.minecraft.nbt.Tag; 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 public class ComponentCustom implements IBuilderComponent
{ {
private Tag nbt; private Tag nbt;

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java
View File

@@ -7,10 +7,7 @@ import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.StringTag; import net.minecraft.nbt.StringTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.Component; 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 public class ComponentDisplay implements IBuilderComponent
{ {
private MutableTextComponent name = new MutableTextComponent(); private MutableTextComponent name = new MutableTextComponent();

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentEnchantment.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotion.java
View File

@@ -12,10 +12,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag; import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraft.world.effect.MobEffect; 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 public abstract class ComponentPotion implements IBuilderComponent
{ {
protected final Map<MobEffect, EffectNBT> potions = new HashMap<MobEffect, EffectNBT>(); protected final Map<MobEffect, EffectNBT> potions = new HashMap<MobEffect, EffectNBT>();

4
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionItem.java
View File

@@ -1,9 +1,5 @@
package exopandora.worldhandler.builder.component.impl; 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 public class ComponentPotionItem extends ComponentPotion
{ {
@Override @Override

4
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentPotionMob.java
View File

@@ -1,9 +1,5 @@
package exopandora.worldhandler.builder.component.impl; 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 public class ComponentPotionMob extends ComponentPotion
{ {
@Override @Override

3
src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/component/impl/EffectNBT.java
View File

@@ -2,10 +2,7 @@ package exopandora.worldhandler.builder.component.impl;
import exopandora.worldhandler.builder.INBTWritable; import exopandora.worldhandler.builder.INBTWritable;
import net.minecraft.nbt.CompoundTag; 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 public class EffectNBT implements INBTWritable
{ {
private byte amplifier; private byte amplifier;

3
src/main/java/exopandora/worldhandler/builder/component/impl/EntityNBT.java
View File

@@ -27,10 +27,7 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState; 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 public class EntityNBT implements IBuilderComponent
{ {
private ResourceLocation id; private ResourceLocation id;

5
src/main/java/exopandora/worldhandler/builder/impl/BuilderAdvancement.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderBlockPos.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilderNBT; import exopandora.worldhandler.builder.CommandBuilderNBT;
import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.builder.types.CoordinateInt;
import net.minecraft.core.BlockPos; 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 public abstract class BuilderBlockPos extends CommandBuilderNBT
{ {
private final int offset; private final int offset;

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderButcher.java
View File

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; import exopandora.worldhandler.builder.types.ArgumentType;
import exopandora.worldhandler.builder.types.TargetSelector; import exopandora.worldhandler.builder.types.TargetSelector;
import net.minecraft.resources.ResourceLocation; 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 public class BuilderButcher extends CommandBuilder
{ {
private final TargetSelector targetSelector = new TargetSelector(); private final TargetSelector targetSelector = new TargetSelector();

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderClone.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderCustomItem.java
View File

@@ -10,10 +10,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.item.enchantment.Enchantment; 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 public class BuilderCustomItem extends BuilderGive
{ {
private final ComponentAttributeItem attribute; private final ComponentAttributeItem attribute;

5
src/main/java/exopandora/worldhandler/builder/impl/BuilderData.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderDifficulty.java
View File

@@ -4,10 +4,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; import exopandora.worldhandler.builder.types.ArgumentType;
import net.minecraft.world.Difficulty; 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 class BuilderDifficulty extends CommandBuilder
{ {
public BuilderDifficulty() public BuilderDifficulty()

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderDoubleBlockPos.java
View File

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.builder.types.CoordinateInt;
import exopandora.worldhandler.util.BlockHelper; import exopandora.worldhandler.util.BlockHelper;
import net.minecraft.core.BlockPos; 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 abstract class BuilderDoubleBlockPos extends CommandBuilder
{ {
public BuilderDoubleBlockPos() public BuilderDoubleBlockPos()

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderEnchantment.java
View File

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; import exopandora.worldhandler.builder.types.ArgumentType;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.enchantment.Enchantment; 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 public class BuilderEnchantment extends CommandBuilder
{ {
@Nullable @Nullable

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderEntity.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderExecute.java
View File

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

5
src/main/java/exopandora/worldhandler/builder/impl/BuilderExperience.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderFill.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderGamemode.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 class BuilderGamemode extends CommandBuilder
{ {
public BuilderGamemode() public BuilderGamemode()
@@ -52,7 +49,6 @@ public class BuilderGamemode extends CommandBuilder
return syntax; return syntax;
} }
@OnlyIn(Dist.CLIENT)
public static enum EnumGamemode public static enum EnumGamemode
{ {
SURVIVAL, SURVIVAL,

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderGamerule.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 class BuilderGamerule extends CommandBuilder
{ {
public BuilderGamerule() public BuilderGamerule()

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderGeneric.java
View File

@@ -2,10 +2,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandString; import exopandora.worldhandler.builder.CommandString;
import exopandora.worldhandler.builder.ICommandBuilder; 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 public class BuilderGeneric implements ICommandBuilder
{ {
private final String command; private final String command;

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderGive.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderMultiCommand.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import java.util.Arrays; import java.util.Arrays;
import exopandora.worldhandler.builder.ICommandBuilder; 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 public class BuilderMultiCommand implements ICommandBuilder
{ {
private final ICommandBuilder[] builders; private final ICommandBuilder[] builders;

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderNoteEditor.java
View File

@@ -5,10 +5,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; 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 class BuilderNoteEditor extends BuilderSetBlock
{ {
public BuilderNoteEditor() public BuilderNoteEditor()

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayer.java
View File

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 public class BuilderPlayer extends CommandBuilder
{ {
private final String command; private final String command;

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderPlayerReason.java
View File

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 public class BuilderPlayerReason extends CommandBuilder
{ {
private final String command; private final String command;

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionEffect.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderPotionItem.java
View File

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.component.impl.ComponentPotionItem;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.item.Item; 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 public class BuilderPotionItem extends BuilderGive
{ {
private final ComponentPotionItem potion; private final ComponentPotionItem potion;

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderRecipe.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboard.java
View File

@@ -1,10 +1,7 @@
package exopandora.worldhandler.builder.impl; package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; 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 public abstract class BuilderScoreboard extends CommandBuilder
{ {
@Override @Override

6
src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardObjectives.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderScoreboardPlayers.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderSetBlock.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java
View File

@@ -5,10 +5,7 @@ import javax.annotation.Nullable;
import exopandora.worldhandler.builder.component.impl.ComponentTag; import exopandora.worldhandler.builder.component.impl.ComponentTag;
import exopandora.worldhandler.util.MutableTextComponent; import exopandora.worldhandler.util.MutableTextComponent;
import exopandora.worldhandler.util.SignText; 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 public class BuilderSignEditor extends BuilderData
{ {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

5
src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java
View File

@@ -2,13 +2,10 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType;
import exopandora.worldhandler.builder.types.Coordinate.EnumType; import exopandora.worldhandler.builder.types.Coordinate.EnumType;
import exopandora.worldhandler.builder.types.CoordinateInt; 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 class BuilderSpawnpoint extends CommandBuilder
{ {
public BuilderSpawnpoint() public BuilderSpawnpoint()

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java
View File

@@ -6,10 +6,7 @@ import exopandora.worldhandler.builder.types.Coordinate.EnumType;
import exopandora.worldhandler.builder.types.CoordinateDouble; import exopandora.worldhandler.builder.types.CoordinateDouble;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation; 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 class BuilderSummon extends BuilderEntity
{ {
public BuilderSummon() public BuilderSummon()

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderTag.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderTeams.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderTime.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 class BuilderTime extends CommandBuilder
{ {
public BuilderTime() public BuilderTime()
@@ -52,7 +49,6 @@ public class BuilderTime extends CommandBuilder
return syntax; return syntax;
} }
@OnlyIn(Dist.CLIENT)
public static enum EnumMode public static enum EnumMode
{ {
ADD, ADD,

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderTrigger.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderUsercontent.java
View File

@@ -14,10 +14,7 @@ import exopandora.worldhandler.builder.types.ItemResourceLocation;
import exopandora.worldhandler.builder.types.TargetSelector; import exopandora.worldhandler.builder.types.TargetSelector;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation; 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 public class BuilderUsercontent extends CommandBuilder
{ {
private final String name; private final String name;

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderWH.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 public class BuilderWH extends CommandBuilder
{ {
@Override @Override

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderWeather.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 class BuilderWeather extends CommandBuilder
{ {
public BuilderWeather() public BuilderWeather()
@@ -52,7 +49,6 @@ public class BuilderWeather extends CommandBuilder
return syntax; return syntax;
} }
@OnlyIn(Dist.CLIENT)
public static enum EnumWeather public static enum EnumWeather
{ {
CLEAR, CLEAR,

4
src/main/java/exopandora/worldhandler/builder/impl/BuilderWhitelist.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/impl/BuilderWorldHandler.java
View File

@@ -3,10 +3,7 @@ package exopandora.worldhandler.builder.impl;
import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandBuilder;
import exopandora.worldhandler.builder.CommandSyntax; import exopandora.worldhandler.builder.CommandSyntax;
import exopandora.worldhandler.builder.types.ArgumentType; 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 public class BuilderWorldHandler extends CommandBuilder
{ {
@Override @Override

3
src/main/java/exopandora/worldhandler/builder/types/ArgumentType.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/types/BlockResourceLocation.java
View File

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

5
src/main/java/exopandora/worldhandler/builder/types/Coordinate.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/types/GreedyString.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/types/ICoordinate.java
View File

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

3
src/main/java/exopandora/worldhandler/builder/types/ItemResourceLocation.java
View File

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

4
src/main/java/exopandora/worldhandler/builder/types/TargetSelector.java
View File

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

3
src/main/java/exopandora/worldhandler/config/Config.java
View File

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

3
src/main/java/exopandora/worldhandler/config/ConfigCategoryButcher.java
View File

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

3
src/main/java/exopandora/worldhandler/config/ConfigCategorySettings.java
View File

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

4
src/main/java/exopandora/worldhandler/config/ConfigCategorySkin.java
View File

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

3
src/main/java/exopandora/worldhandler/config/ConfigCategorySliders.java
View File

@@ -1,11 +1,8 @@
package exopandora.worldhandler.config; 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;
import net.minecraftforge.common.ForgeConfigSpec.DoubleValue; import net.minecraftforge.common.ForgeConfigSpec.DoubleValue;
@OnlyIn(Dist.CLIENT)
public class ConfigCategorySliders public class ConfigCategorySliders
{ {
private final DoubleValue maxPotionAmplifier; private final DoubleValue maxPotionAmplifier;

3
src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
View File

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

3
src/main/java/exopandora/worldhandler/event/KeyHandler.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/DummyScreen.java
View File

@@ -2,10 +2,7 @@ package exopandora.worldhandler.gui;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.TextComponent; 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 public class DummyScreen extends Screen
{ {
private final Runnable runnable; private final Runnable runnable;

3
src/main/java/exopandora/worldhandler/gui/category/Categories.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/category/Category.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/container/Container.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/container/IContainer.java
View File

@@ -6,10 +6,7 @@ import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.components.Widget;
import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.narration.NarratableEntry; 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 public interface IContainer
{ {
<T extends GuiEventListener & Widget & NarratableEntry> T add(T button); <T extends GuiEventListener & Widget & NarratableEntry> T add(T button);

3
src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java
View File

@@ -29,10 +29,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.components.Widget;
import net.minecraft.network.chat.TextComponent; 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 public class GuiWorldHandler extends Container
{ {
private static String player = Minecraft.getInstance().getUser().getName(); private static String player = Minecraft.getInstance().getUser().getName();

3
src/main/java/exopandora/worldhandler/gui/content/Content.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/Contents.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/IContent.java
View File

@@ -7,10 +7,7 @@ import exopandora.worldhandler.builder.ICommandBuilder;
import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.category.Category;
import exopandora.worldhandler.gui.widget.IWidget; import exopandora.worldhandler.gui.widget.IWidget;
import net.minecraft.network.chat.MutableComponent; 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 public interface IContent extends IWidget
{ {
Category getCategory(); Category getCategory();

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherPresets.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java
View File

@@ -24,10 +24,7 @@ import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.level.LevelSettings; import net.minecraft.world.level.LevelSettings;
import net.minecraft.world.level.levelgen.WorldGenSettings; 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 public class ContentChangeWorld extends ContentChild
{ {
@Override @Override

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentChild.java
View File

@@ -4,10 +4,7 @@ import exopandora.worldhandler.gui.category.Category;
import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Content;
import exopandora.worldhandler.gui.content.Contents; import exopandora.worldhandler.gui.content.Contents;
import net.minecraft.network.chat.MutableComponent; 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 public abstract class ContentChild extends Content
{ {
private Content parent; private Content parent;

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentCommandStack.java
View File

@@ -36,10 +36,7 @@ import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.block.Blocks; 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 public class ContentCommandStack extends ContentChild
{ {
private static final int HEAD_LENGTH = 1; private static final int HEAD_LENGTH = 1;

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java
View File

@@ -21,10 +21,7 @@ import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; 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 public class ContentContainers extends Content
{ {
@Override @Override

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentContinue.java
View File

@@ -11,10 +11,7 @@ import exopandora.worldhandler.util.ActionHelper;
import exopandora.worldhandler.util.CommandHelper; import exopandora.worldhandler.util.CommandHelper;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.TranslatableComponent; 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 public class ContentContinue extends ContentChild
{ {
private ICommandBuilder builder; private ICommandBuilder builder;

4
src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java
View File

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

4
src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java
View File

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

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentExperience.java
View File

@@ -16,10 +16,7 @@ import exopandora.worldhandler.util.ActionHelper;
import exopandora.worldhandler.util.CommandHelper; import exopandora.worldhandler.util.CommandHelper;
import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TranslatableComponent; 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 public class ContentExperience extends Content
{ {
private final BuilderExperience builderExperience = new BuilderExperience(); private final BuilderExperience builderExperience = new BuilderExperience();

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java
View File

@@ -29,10 +29,7 @@ import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.level.GameRules; import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.GameRules.GameRuleTypeVisitor; 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 public class ContentGamerules extends Content
{ {
private GuiTextFieldTooltip valueField; private GuiTextFieldTooltip valueField;

3
src/main/java/exopandora/worldhandler/gui/content/impl/ContentMain.java
View File

@@ -17,10 +17,7 @@ import net.minecraft.client.gui.screens.packs.PackSelectionScreen;
import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent; 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 public class ContentMain extends Content
{ {
@Override @Override

4
src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java
View File

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

Some files were not shown because too many files have changed in this diff Show More