Remove distmarker annotations
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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<String, String> values = new HashMap<String, String>();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<UsercontentConfig> CONFIGS = new ArrayList<UsercontentConfig>();
|
||||
@@ -164,7 +161,6 @@ public class UsercontentLoader
|
||||
return valid;
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T>
|
||||
{
|
||||
private final Class<T> klass;
|
||||
|
||||
@@ -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<T> extends VisibleObject<T>
|
||||
{
|
||||
private final BooleanExpression active;
|
||||
|
||||
@@ -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<T>
|
||||
{
|
||||
private final BooleanExpression visible;
|
||||
|
||||
@@ -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<T extends Enum<T>> implements ILogicMapped<JsonItem>
|
||||
{
|
||||
private final ActionHandlerFactory actionHandlerFactory;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<T extends Enum<T>> extends UsercontentLogicMapped<T> implements ILogicPageList<JsonItem>
|
||||
{
|
||||
private final Container container;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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<T extends Enum<T>>
|
||||
{
|
||||
@SerializedName("action")
|
||||
@@ -73,7 +69,6 @@ public abstract class AbstractJsonWidget<T extends Enum<T>>
|
||||
}
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static enum Type
|
||||
{
|
||||
BUTTON,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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<Type>
|
||||
{
|
||||
@SerializedName("type")
|
||||
@@ -28,7 +25,6 @@ public class JsonMenu extends AbstractJsonWidget<Type>
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static enum Type
|
||||
{
|
||||
PAGE_LIST;
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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<Type>
|
||||
{
|
||||
@SerializedName("text")
|
||||
@@ -121,7 +118,6 @@ public class JsonWidget extends AbstractJsonWidget<Type>
|
||||
}
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static enum Type
|
||||
{
|
||||
BUTTON,
|
||||
|
||||
Reference in New Issue
Block a user