sa

GTNewHorizons · Jul 18, 2023 · ba88c78 · ba88c78
1 parent f5b4998
commit ba88c78
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 48 deletions.
diff --git a/src/main/java/toast/specialMobs/EventHandler.java b/src/main/java/toast/specialMobs/EventHandler.java
@@ -17,13 +17,13 @@
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 
+import cpw.mods.fml.common.eventhandler.EventPriority;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import toast.specialMobs.entity.blaze.EntitySmolderBlaze;
 import toast.specialMobs.entity.pigzombie.EntityPlaguePigZombie;
 import toast.specialMobs.entity.skeleton.EntityPoisonSkeleton;
 import toast.specialMobs.entity.witch.EntityUndeadWitch;
 import toast.specialMobs.entity.zombie.EntityPlagueZombie;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class EventHandler {
 

diff --git a/src/main/java/toast/specialMobs/_SpecialMobs.java b/src/main/java/toast/specialMobs/_SpecialMobs.java
@@ -10,15 +10,6 @@
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.config.Configuration;
 
-import toast.specialMobs.entity.EntityLavaMonster;
-import toast.specialMobs.entity.EntitySpecialFishHook;
-import toast.specialMobs.entity.EntitySpecialSpitball;
-import toast.specialMobs.entity.SpawnLavaMonster;
-import toast.specialMobs.entity.creeper.EntityEnderCreeper;
-import toast.specialMobs.entity.creeper.EntityFireCreeper;
-import toast.specialMobs.entity.ghast.EntityMiniGhast;
-import toast.specialMobs.network.MessageExplosion;
-import toast.specialMobs.network.MessageTexture;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -29,6 +20,15 @@
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.relauncher.Side;
+import toast.specialMobs.entity.EntityLavaMonster;
+import toast.specialMobs.entity.EntitySpecialFishHook;
+import toast.specialMobs.entity.EntitySpecialSpitball;
+import toast.specialMobs.entity.SpawnLavaMonster;
+import toast.specialMobs.entity.creeper.EntityEnderCreeper;
+import toast.specialMobs.entity.creeper.EntityFireCreeper;
+import toast.specialMobs.entity.ghast.EntityMiniGhast;
+import toast.specialMobs.network.MessageExplosion;
+import toast.specialMobs.network.MessageTexture;
 
 /**
  * This is the mod class. Everything the mod does is initialized by this class.

diff --git a/src/main/java/toast/specialMobs/client/ClientProxy.java b/src/main/java/toast/specialMobs/client/ClientProxy.java
@@ -3,6 +3,10 @@
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import toast.specialMobs.CommonProxy;
 import toast.specialMobs.entity.EntityLavaMonster;
 import toast.specialMobs.entity.EntitySpecialFishHook;
@@ -19,10 +23,6 @@
 import toast.specialMobs.entity.spider.Entity_SpecialSpider;
 import toast.specialMobs.entity.witch.Entity_SpecialWitch;
 import toast.specialMobs.entity.zombie.Entity_SpecialZombie;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy {

diff --git a/src/main/java/toast/specialMobs/client/RenderLavaMonster.java b/src/main/java/toast/specialMobs/client/RenderLavaMonster.java
@@ -7,11 +7,11 @@
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import toast.specialMobs.Properties;
 import toast.specialMobs._SpecialMobs;
 import toast.specialMobs.entity.EntityLavaMonster;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class RenderLavaMonster extends RenderLiving {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialBlaze.java b/src/main/java/toast/specialMobs/client/RenderSpecialBlaze.java
@@ -7,9 +7,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialBlaze extends RenderBlaze {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialCreeper.java b/src/main/java/toast/specialMobs/client/RenderSpecialCreeper.java
@@ -9,9 +9,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialCreeper extends RenderCreeper {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialEnderman.java b/src/main/java/toast/specialMobs/client/RenderSpecialEnderman.java
@@ -9,9 +9,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialEnderman extends RenderEnderman {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialFishHook.java b/src/main/java/toast/specialMobs/client/RenderSpecialFishHook.java
@@ -11,9 +11,9 @@
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import toast.specialMobs.entity.EntitySpecialFishHook;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.EntitySpecialFishHook;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialFishHook extends Render {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialGhast.java b/src/main/java/toast/specialMobs/client/RenderSpecialGhast.java
@@ -7,10 +7,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
-import toast.specialMobs.entity.ghast.Entity_SpecialGhast;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
+import toast.specialMobs.entity.ghast.Entity_SpecialGhast;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialGhast extends RenderGhast {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialSilverfish.java b/src/main/java/toast/specialMobs/client/RenderSpecialSilverfish.java
@@ -7,9 +7,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialSilverfish extends RenderSilverfish {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialSkeleton.java b/src/main/java/toast/specialMobs/client/RenderSpecialSkeleton.java
@@ -10,10 +10,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.INinja;
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.INinja;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialSkeleton extends RenderSkeleton {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialSlime.java b/src/main/java/toast/specialMobs/client/RenderSpecialSlime.java
@@ -8,9 +8,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialSlime extends RenderSlime {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialSpider.java b/src/main/java/toast/specialMobs/client/RenderSpecialSpider.java
@@ -9,9 +9,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialSpider extends RenderSpider {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialSpitball.java b/src/main/java/toast/specialMobs/client/RenderSpecialSpitball.java
@@ -8,9 +8,9 @@
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import toast.specialMobs._SpecialMobs;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs._SpecialMobs;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialSpitball extends Render {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialWitch.java b/src/main/java/toast/specialMobs/client/RenderSpecialWitch.java
@@ -15,9 +15,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialWitch extends RenderWitch {

diff --git a/src/main/java/toast/specialMobs/client/RenderSpecialZombie.java b/src/main/java/toast/specialMobs/client/RenderSpecialZombie.java
@@ -11,10 +11,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import toast.specialMobs.entity.INinja;
-import toast.specialMobs.entity.ISpecialMob;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import toast.specialMobs.entity.INinja;
+import toast.specialMobs.entity.ISpecialMob;
 
 @SideOnly(Side.CLIENT)
 public class RenderSpecialZombie extends RenderZombie {

diff --git a/src/main/java/toast/specialMobs/entity/ISpecialMob.java b/src/main/java/toast/specialMobs/entity/ISpecialMob.java
@@ -15,9 +15,9 @@
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.FakePlayer;
 
-import toast.specialMobs.Properties;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
+import toast.specialMobs.Properties;
 
 /**
  * This interface is implemented by all monsters in this mod. It allows for commonly used data to be stored conveniently

diff --git a/src/main/java/toast/specialMobs/entity/SpawnLavaMonster.java b/src/main/java/toast/specialMobs/entity/SpawnLavaMonster.java
@@ -17,13 +17,13 @@
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.event.ForgeEventFactory;
 
-import toast.specialMobs.Properties;
-import toast.specialMobs._SpecialMobs;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
+import toast.specialMobs.Properties;
+import toast.specialMobs._SpecialMobs;
 
 public class SpawnLavaMonster {
 

diff --git a/src/main/java/toast/specialMobs/entity/creeper/Entity_SpecialCreeper.java b/src/main/java/toast/specialMobs/entity/creeper/Entity_SpecialCreeper.java
@@ -9,13 +9,13 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import toast.specialMobs.DataWatcherHelper;
 import toast.specialMobs.Properties;
 import toast.specialMobs._SpecialMobs;
 import toast.specialMobs.entity.ISpecialMob;
 import toast.specialMobs.entity.SpecialMobData;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class Entity_SpecialCreeper extends EntityCreeper implements ISpecialMob {
 

diff --git a/src/main/java/toast/specialMobs/entity/ghast/EntityFaintGhast.java b/src/main/java/toast/specialMobs/entity/ghast/EntityFaintGhast.java
@@ -8,11 +8,11 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import toast.specialMobs.EffectHelper;
 import toast.specialMobs.Properties;
 import toast.specialMobs._SpecialMobs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class EntityFaintGhast extends EntityMeleeGhast {
 

diff --git a/src/main/java/toast/specialMobs/network/MessageExplosion.java b/src/main/java/toast/specialMobs/network/MessageExplosion.java
@@ -6,11 +6,11 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
-import toast.specialMobs._SpecialMobs;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import toast.specialMobs._SpecialMobs;
 
 public class MessageExplosion implements IMessage {
 

diff --git a/src/main/java/toast/specialMobs/network/MessageTexture.java b/src/main/java/toast/specialMobs/network/MessageTexture.java
@@ -4,13 +4,13 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
-import toast.specialMobs._SpecialMobs;
-import toast.specialMobs.entity.ISpecialMob;
-import toast.specialMobs.entity.SpecialMobData;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import toast.specialMobs._SpecialMobs;
+import toast.specialMobs.entity.ISpecialMob;
+import toast.specialMobs.entity.SpecialMobData;
 
 public class MessageTexture implements IMessage {
 

diff --git a/src/main/java/toast/specialMobs/waila/WailaCompat.java b/src/main/java/toast/specialMobs/waila/WailaCompat.java
@@ -2,18 +2,17 @@
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaEntityAccessor;
-import mcp.mobius.waila.api.IWailaEntityProvider;
-import mcp.mobius.waila.api.IWailaRegistrar;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaEntityAccessor;
+import mcp.mobius.waila.api.IWailaEntityProvider;
+import mcp.mobius.waila.api.IWailaRegistrar;
 import toast.specialMobs.entity.ISpecialMob;
 
 public class WailaCompat implements IWailaEntityProvider {