Some import renames and compile error fixes, killed ~800.

This commit is contained in:
LexManos committed 2016-03-01 04:58:03 -08:00
1 parent 1f80eb17df
commit ac7c4d2f6c
90 files changed
+454 -441

No files matched your search

@@ -1,13 +1,13 @@
package net.minecraftforge.client.event;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
@Cancelable
public class ClientChatReceivedEvent extends Event
{
public IChatComponent message;
public ITextComponent message;
/**
* Introduced in 1.8:
* 0 : Standard Text Message
@@ -15,7 +15,7 @@ public class ClientChatReceivedEvent extends Event
* 2 : 'Status' message, displayed above action bar, where song notifications are.
*/
public final byte type;
public ClientChatReceivedEvent(byte type, IChatComponent message)
public ClientChatReceivedEvent(byte type, ITextComponent message)
{
this.type = type;
this.message = message;
@@ -4,7 +4,7 @@ import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.client.renderer.RenderGlobal;
@Cancelable
@@ -12,12 +12,12 @@ public class DrawBlockHighlightEvent extends Event
{
public final RenderGlobal context;
public final EntityPlayer player;
public final MovingObjectPosition target;
public final RayTraceResult target;
public final int subID;
public final ItemStack currentItem;
public final float partialTicks;
public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, MovingObjectPosition target, int subID, ItemStack currentItem, float partialTicks)
public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, ItemStack currentItem, float partialTicks)
{
this.context = context;
this.player = player;
@@ -1,10 +1,10 @@
package net.minecraftforge.client.event;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelManager;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.util.IRegistry;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelManager;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.util.registry.IRegistry;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.common.eventhandler.Event;
@@ -3,7 +3,7 @@ package net.minecraftforge.client.event;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
@@ -2,18 +2,18 @@ package net.minecraftforge.client.event;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.client.renderer.entity.RenderLivingBase;
import net.minecraft.entity.EntityLivingBase;
public abstract class RenderLivingEvent<T extends EntityLivingBase> extends Event
{
public final EntityLivingBase entity;
public final RendererLivingEntity<T> renderer;
public final RenderLivingBase<T> renderer;
public final double x;
public final double y;
public final double z;
public RenderLivingEvent(EntityLivingBase entity, RendererLivingEntity<T> renderer, double x, double y, double z)
public RenderLivingEvent(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z)
{
this.entity = entity;
this.renderer = renderer;
@@ -25,25 +25,25 @@ public abstract class RenderLivingEvent<T extends EntityLivingBase> extends Even
@Cancelable
public static class Pre<T extends EntityLivingBase> extends RenderLivingEvent<T>
{
public Pre(EntityLivingBase entity, RendererLivingEntity<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Pre(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
}
public static class Post<T extends EntityLivingBase> extends RenderLivingEvent<T>
{
public Post(EntityLivingBase entity, RendererLivingEntity<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Post(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
}
public abstract static class Specials<T extends EntityLivingBase> extends RenderLivingEvent<T>
{
public Specials(EntityLivingBase entity, RendererLivingEntity<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Specials(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
@Cancelable
public static class Pre<T extends EntityLivingBase> extends Specials<T>
{
public Pre(EntityLivingBase entity, RendererLivingEntity<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Pre(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
}
public static class Post<T extends EntityLivingBase> extends Specials<T>
{
public Post(EntityLivingBase entity, RendererLivingEntity<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Post(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
}
}
}
@@ -2,17 +2,17 @@ package net.minecraftforge.client.event;
import net.minecraftforge.fml.common.eventhandler.Event;
//import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.world.ChunkCache;
public abstract class RenderWorldEvent extends Event
{
public final WorldRenderer renderer;
public final VertexBuffer renderer;
public final ChunkCache chunkCache;
//public final RenderBlocks renderBlocks;
public final int pass;
public RenderWorldEvent(WorldRenderer renderer, ChunkCache chunkCache, /*RenderBlocks renderBlocks,*/ int pass)
public RenderWorldEvent(VertexBuffer renderer, ChunkCache chunkCache, /*RenderBlocks renderBlocks,*/ int pass)
{
this.renderer = renderer;
this.chunkCache = chunkCache;
@@ -26,7 +26,7 @@ public abstract class RenderWorldEvent extends Event
*/
public static class Pre extends RenderWorldEvent
{
public Pre(WorldRenderer renderer, ChunkCache chunkCache, /*RenderBlocks renderBlocks,*/ int pass){ super(renderer, chunkCache, /*renderBlocks,*/ pass); }
public Pre(VertexBuffer renderer, ChunkCache chunkCache, /*RenderBlocks renderBlocks,*/ int pass){ super(renderer, chunkCache, /*renderBlocks,*/ pass); }
}
/**
@@ -34,6 +34,6 @@ public abstract class RenderWorldEvent extends Event
*/
public static class Post extends RenderWorldEvent
{
public Post(WorldRenderer renderer, ChunkCache chunkCache, /*RenderBlocks renderBlocks,*/ int pass){ super(renderer, chunkCache, /*renderBlocks,*/ pass); }
public Post(VertexBuffer renderer, ChunkCache chunkCache, /*RenderBlocks renderBlocks,*/ int pass){ super(renderer, chunkCache, /*renderBlocks,*/ pass); }
}
}