Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-09-08 10:25:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up a bunch of imports (Down to 305 errors, 9 warnings)

Browse Source
This commit is contained in:
Ammon Lauritzen
2016-02-24 11:54:13 -06:00
parent 5a22b92b06
commit 4632f40f8e
12 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/fairies/FairyFactions.java
View File

@@ -6,14 +6,6 @@ import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import fairies.entity.EntityFairy;
import fairies.event.FairyEventListener;
import fairies.proxy.CommonProxy;
@@ -23,6 +15,14 @@ import net.minecraft.entity.EnumCreatureType;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = Version.MOD_ID, version = Version.VERSION)
public class FairyFactions {

2
src/main/java/fairies/Loc.java
View File

@@ -1,6 +1,6 @@
package fairies;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraftforge.fml.common.registry.LanguageRegistry;
/**
* Constants for various message localizations as well as shortcut methods

2
src/main/java/fairies/ai/FairyJob.java
View File

@@ -3,7 +3,6 @@ package fairies.ai;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.relauncher.ReflectionHelper;
import fairies.entity.EntityFairy;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCrops;
@@ -25,6 +24,7 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
public class FairyJob {
public FairyJob( final EntityFairy entityfairy ) {

3
src/main/java/fairies/client/gui/GuiName.java
View File

@@ -28,8 +28,7 @@ public class GuiName extends GuiScreen
}
}
@SuppressWarnings("unchecked")
@Override
@Override
public void initGui()
{
buttonList.clear();

1
src/main/java/fairies/client/render/RenderFairy.java
View File

@@ -11,7 +11,6 @@ import fairies.entity.EntityFairy;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;

6
src/main/java/fairies/entity/EntityFairy.java
View File

@@ -4,9 +4,6 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fairies.FairyConfig;
import fairies.FairyFactions;
import fairies.Loc;
@@ -49,7 +46,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntitySign;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EntityDamageSourceIndirect;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ResourceLocation;
@@ -58,6 +54,8 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.EmptyChunk;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.SideOnly;
public class EntityFairy extends EntityAnimal {

6
src/main/java/fairies/event/FairyEventListener.java
View File

@@ -4,15 +4,15 @@ import java.util.Map;
import com.google.common.collect.Maps;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import fairies.FairyFactions;
import fairies.Version;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
public class FairyEventListener {

2
src/main/java/fairies/event/FairyPacket.java
View File

@@ -1,11 +1,11 @@
package fairies.event;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import fairies.Version;
import fairies.event.FairyEventListener.PacketType;
import io.netty.buffer.Unpooled;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
public abstract class FairyPacket extends FMLProxyPacket {

15
src/main/java/fairies/event/PacketSetFairyName.java
View File

@@ -33,12 +33,7 @@ public class PacketSetFairyName extends FairyPacket {
final PacketBuffer buf = (PacketBuffer)this.payload();
buf.writeInt(this.fairyID);
try {
buf.writeStringToBuffer(this.name);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
buf.writeString(this.name);
}
@Override
@@ -46,12 +41,8 @@ public class PacketSetFairyName extends FairyPacket {
FairyFactions.LOGGER.info("PacketSetFairyName.init");
fairyID = buf.readInt();
try {
name = buf.readStringFromBuffer(MAX_NAME_LENGTH).trim();
if( name.length() < MIN_NAME_LENGTH ) {
name = "";
}
} catch (IOException e) {
name = buf.readStringFromBuffer(MAX_NAME_LENGTH).trim();
if( name.length() < MIN_NAME_LENGTH ) {
name = "";
}
}

6
src/main/java/fairies/proxy/ClientProxy.java
View File

@@ -1,8 +1,5 @@
package fairies.proxy;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fairies.FairyFactions;
import fairies.client.gui.GuiName;
import fairies.client.render.ModelFairy;
@@ -12,6 +9,9 @@ import fairies.entity.EntityFairy;
import fairies.entity.FairyEntityFishHook;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy {

8
src/main/java/fairies/proxy/CommonProxy.java
View File

@@ -2,10 +2,6 @@ package fairies.proxy;
import java.util.List;
import cpw.mods.fml.common.network.FMLEventChannel;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.common.registry.EntityRegistry;
import fairies.FairyFactions;
import fairies.Version;
import fairies.entity.EntityFairy;
@@ -22,6 +18,10 @@ import net.minecraft.network.play.server.S13PacketDestroyEntities;
import net.minecraft.network.play.server.S1BPacketEntityAttach;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChatComponentText;
import net.minecraftforge.fml.common.network.FMLEventChannel;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
import net.minecraftforge.fml.common.registry.EntityRegistry;
public class CommonProxy {

6
src/main/java/fairies/world/Spawner.java
View File

@@ -10,8 +10,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import fairies.entity.EntityFairy;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -25,15 +23,15 @@ import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.passive.EntitySquid;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.MathHelper;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.ChunkPosition;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
import net.minecraft.world.biome.BiomeGenEnd;
import net.minecraft.world.biome.BiomeGenHell;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
public final class Spawner {
private int maxAnimals = 40;