Skip to content

Commit

Permalink
Run optimize imports to remove all the unused imports
Browse files Browse the repository at this point in the history
  • Loading branch information
pupnewfster committed Oct 3, 2019
1 parent 2fdeeb3 commit c3713a5
Show file tree
Hide file tree
Showing 33 changed files with 68 additions and 97 deletions.
6 changes: 1 addition & 5 deletions src/api/java/com/teamacronymcoders/epos/api/feat/Feat.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package com.teamacronymcoders.epos.api.feat;

import net.minecraft.util.ResourceLocation;
import java.util.List;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.registries.ForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistry;

import javax.annotation.Nonnull;
import java.util.List;

public class Feat extends ForgeRegistryEntry<Feat> {
private final List<FeatEventHandler<?>> eventHandlers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import com.google.common.collect.Lists;
import com.teamacronymcoders.epos.api.characterstats.ICharacterStats;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraftforge.eventbus.api.Event;
import org.apache.logging.log4j.util.TriConsumer;

import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.List;

@ParametersAreNonnullByDefault
public class FeatBuilder {
private final ResourceLocation registryName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.teamacronymcoders.epos.api.feat;

import com.teamacronymcoders.epos.api.characterstats.ICharacterStats;
import java.util.Objects;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.eventbus.api.Event;
import org.apache.logging.log4j.util.TriConsumer;

import java.util.Objects;

public class FeatEventHandler<T extends Event> {
public final ResourceLocation featId;
public final TriConsumer<T, LivingEntity, ICharacterStats> eventHandler;
Expand Down
11 changes: 5 additions & 6 deletions src/api/java/com/teamacronymcoders/epos/api/feat/Feats.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Maps;
import com.teamacronymcoders.epos.api.characterstats.ICharacterStats;
import net.minecraft.entity.LivingEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.util.INBTSerializable;
import net.minecraftforge.eventbus.api.Event;

import javax.annotation.Nonnull;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import net.minecraft.entity.LivingEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.util.INBTSerializable;
import net.minecraftforge.eventbus.api.Event;

public class Feats implements INBTSerializable<CompoundNBT> {
private final Map<Feat, FeatSource> feats;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponent;
import net.minecraft.util.text.TranslationTextComponent;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

public class JsonUtils {
@Nonnull
public static String getString(JsonObject jsonObject, String fieldName) throws JsonParseException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.teamacronymcoders.epos.api.registry.IRegistryEntry;
import net.minecraftforge.registries.ForgeRegistryEntry;

public abstract class PathFeatureProvider extends ForgeRegistryEntry<PathFeatureProvider> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
import net.minecraft.network.PacketBuffer;

import java.util.List;

public class PathFeatures {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.teamacronymcoders.epos.api.registry;

import net.minecraft.util.ResourceLocation;

import javax.annotation.Nonnull;
import net.minecraft.util.ResourceLocation;

public interface IRegistryEntry {
@Nonnull
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.teamacronymcoders.epos.api.registry;

import javax.annotation.Nonnull;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;

import javax.annotation.Nonnull;

public class MissingRegistryEntry<T extends INamedRegistryEntry<T>> implements INamedRegistryEntry<T> {
private final ResourceLocation registryName;
private final ITextComponent name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.teamacronymcoders.epos.api.registry;

import net.minecraftforge.eventbus.api.GenericEvent;

import java.util.List;
import net.minecraftforge.eventbus.api.GenericEvent;

public class RegistrationEvent<T extends IRegistryEntry> extends GenericEvent<T> {
private final Registry<T> registry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.teamacronymcoders.epos.api.registry;

import com.google.common.collect.Maps;
import net.minecraft.util.ResourceLocation;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.util.ResourceLocation;

@ParametersAreNonnullByDefault
public class Registry<T extends IRegistryEntry> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.teamacronymcoders.epos.api.skill;

import javax.annotation.Nonnull;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;

import javax.annotation.Nonnull;

public class MissingSkill implements ISkill {
private final ResourceLocation registryName;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.teamacronymcoders.epos.api.skill;

import javax.annotation.Nonnull;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.util.INBTSerializable;

import javax.annotation.Nonnull;

public class SkillInfo implements INBTSerializable<CompoundNBT>, Comparable<SkillInfo> {
private final String registryName;
private final ISkill skill;
Expand Down
10 changes: 4 additions & 6 deletions src/api/java/com/teamacronymcoders/epos/api/skill/Skills.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.teamacronymcoders.epos.api.skill;

import com.teamacronymcoders.epos.api.EposAPI;
import com.teamacronymcoders.epos.api.characterstats.ICharacterStats;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.INBTSerializable;
import org.apache.commons.lang3.tuple.Pair;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;

public class Skills implements INBTSerializable<CompoundNBT> {
private final Map<String, SkillInfo> skillInfoMap;

Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/teamacronymcoders/epos/Epos.java
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
package com.teamacronymcoders.epos;

import static com.teamacronymcoders.epos.api.EposAPI.ID;
import static com.teamacronymcoders.epos.api.EposAPI.PATH_REGISTRY;
import static com.teamacronymcoders.epos.api.EposAPI.SKILL_REGISTRY;

import com.hrznstudio.titanium.module.ModuleController;
import com.hrznstudio.titanium.tab.AdvancedTitaniumTab;
import com.teamacronymcoders.epos.api.characterstats.ICharacterStats;
import com.teamacronymcoders.epos.api.path.IPath;
import com.teamacronymcoders.epos.api.skill.ISkill;
import com.teamacronymcoders.epos.capability.NBTCapabilityStorage;
import com.teamacronymcoders.epos.characterstats.CharacterStats;
import com.teamacronymcoders.epos.configs.EposClientConfig;
import com.teamacronymcoders.epos.feature.EposModules;
import com.teamacronymcoders.epos.locks.DefaultLocks;
import com.teamacronymcoders.epos.json.JsonLoader;
import com.teamacronymcoders.epos.json.jsondirector.RegistryJsonDirector;
import com.teamacronymcoders.epos.json.jsonprovider.PathJsonProvider;
import com.teamacronymcoders.epos.json.jsonprovider.SkillJsonProvider;
import com.teamacronymcoders.epos.locks.DefaultLocks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import static com.teamacronymcoders.epos.api.EposAPI.*;

@Mod(ID)
@Mod.EventBusSubscriber
public class Epos extends ModuleController {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.teamacronymcoders.epos.capability;

import javax.annotation.Nullable;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.INBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.INBTSerializable;

import javax.annotation.Nullable;

public class NBTCapabilityStorage<T extends INBT, U extends INBTSerializable<T>> implements Capability.IStorage<U> {
private final Class<T> nbtClass;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package com.teamacronymcoders.epos.capability;

import com.hrznstudio.titanium.block.tile.inventory.PosInvHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

public class PosInvHandlerCapabilityProvider implements ICapabilityProvider {
private final LazyOptional<IItemHandler> optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@
import com.hrznstudio.titanium.client.gui.addon.SlotsGuiAddon;
import com.hrznstudio.titanium.client.gui.asset.IAssetProvider;
import com.teamacronymcoders.epos.container.QuiverContainer;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.Container;
import net.minecraft.inventory.container.INamedContainerProvider;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;

import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;

public class GuiQuiverAddonScreen extends GuiAddonScreen implements INamedContainerProvider {

private final PosInvHandler handler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.teamacronymcoders.epos.configs;

import net.minecraftforge.common.ForgeConfigSpec;

import java.util.Objects;
import net.minecraftforge.common.ForgeConfigSpec;

public class EposClientConfig {
private static EposClientConfig instance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.hrznstudio.titanium.block.tile.inventory.PosInvHandler;
import com.hrznstudio.titanium.client.gui.asset.IAssetProvider;
import com.teamacronymcoders.epos.feature.quiver.QuiverItem;
import java.awt.Point;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.Container;
Expand All @@ -14,8 +15,6 @@
import net.minecraftforge.items.SlotItemHandler;
import net.minecraftforge.registries.ObjectHolder;

import java.awt.*;

public class QuiverContainer extends Container {
@ObjectHolder("epos:quiver_container")
public static final ContainerType<QuiverContainer> TYPE = null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
package com.teamacronymcoders.epos.eventhandler;

import static com.teamacronymcoders.epos.api.EposAPI.ID;

import com.teamacronymcoders.epos.api.EposAPI;
import com.teamacronymcoders.epos.api.feat.Feat;
import com.teamacronymcoders.epos.api.pathfeature.PathFeatureProvider;
import com.teamacronymcoders.epos.container.QuiverContainer;
import com.teamacronymcoders.epos.feats.*;
import com.teamacronymcoders.epos.feats.EfficiencyFeats;
import com.teamacronymcoders.epos.feats.EnderResistanceFeat;
import com.teamacronymcoders.epos.feats.GluttonousHungerFeat;
import com.teamacronymcoders.epos.feats.GravelExcavatorFeat;
import com.teamacronymcoders.epos.feats.HarvestAreaFeat;
import com.teamacronymcoders.epos.feats.ImprovisedCombatFeat;
import com.teamacronymcoders.epos.feats.LuckyAnglerFeat;
import com.teamacronymcoders.epos.feats.ObsidianSmasherFeat;
import com.teamacronymcoders.epos.feats.OreExtractionFeat;
import com.teamacronymcoders.epos.feats.PalmOfExcavationFeat;
import com.teamacronymcoders.epos.feats.PurityFeats;
import com.teamacronymcoders.epos.feats.SpiritOfBattleFeat;
import com.teamacronymcoders.epos.feats.TimberFeat;
import com.teamacronymcoders.epos.feats.UnarmedStrikeFeat;
import com.teamacronymcoders.epos.feats.WayOfTheBladeFeat;
import com.teamacronymcoders.epos.pathfeature.feat.FeatFeatureProvider;
import com.teamacronymcoders.epos.pathfeature.item.ItemRewardFeatureProvider;
import com.teamacronymcoders.epos.pathfeature.levelupskill.LevelUpSkillFeatureProvider;
Expand All @@ -19,8 +35,6 @@
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.registries.RegistryBuilder;

import static com.teamacronymcoders.epos.api.EposAPI.ID;

@EventBusSubscriber(modid = EposAPI.ID, bus = EventBusSubscriber.Bus.MOD)
public class ForgeRegistryEventHandler {
@SubscribeEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.teamacronymcoders.epos.api.feat.Feat;
import com.teamacronymcoders.epos.api.feat.FeatBuilder;
import com.teamacronymcoders.epos.utils.BlockBreakHelper;
import java.util.ArrayDeque;
import java.util.Deque;
import net.minecraft.block.GravelBlock;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ResourceLocation;
Expand All @@ -12,9 +14,6 @@
import net.minecraftforge.common.ToolType;
import net.minecraftforge.event.world.BlockEvent;

import java.util.ArrayDeque;
import java.util.Deque;

public class GravelExcavatorFeat {
private static final ResourceLocation NAME = new ResourceLocation(EposAPI.ID, "gravel_excavator");
public static final Feat FEAT =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
import com.teamacronymcoders.epos.api.feat.Feat;
import com.teamacronymcoders.epos.api.feat.FeatAcquiredEvent;
import com.teamacronymcoders.epos.api.feat.FeatBuilder;
import java.util.Set;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ToolType;

import java.util.Set;

public class ImprovisedCombatFeat {
private static final ResourceLocation NAME = new ResourceLocation(EposAPI.ID, "improvised_combat");
public static final Feat FEAT =
Expand Down
Loading

0 comments on commit c3713a5

Please sign in to comment.