[1.13] A sweep through deprecations (#5345)

This commit is contained in:
Vincent Lee authored and LexManos committed 2019-01-25 13:29:52 -08:00
1 parent 06a6fac23a
commit 69f8e57cea
13 files changed
-457

No files matched your search

@@ -43,12 +43,6 @@ public class RenderBlockOverlayEvent extends net.minecraftforge.eventbus.api.Eve
private final IBlockState blockForOverlay;
private final BlockPos blockPos;
@Deprecated
public RenderBlockOverlayEvent(EntityPlayer player, float renderPartialTicks, OverlayType type, Block block, int x, int y, int z)
{
this(player, renderPartialTicks, type, block.getDefaultState(), new BlockPos(x, y, z));
}
public RenderBlockOverlayEvent(EntityPlayer player, float renderPartialTicks, OverlayType type, IBlockState block, BlockPos blockPos)
{
this.player = player;
@@ -33,12 +33,6 @@ public abstract class RenderLivingEvent<T extends EntityLivingBase> extends net.
private final double y;
private final double z;
@Deprecated
public RenderLivingEvent(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z)
{
this(entity, renderer, 1, x, y, z);
}
public RenderLivingEvent(EntityLivingBase entity, RenderLivingBase<T> renderer, float partialRenderTick, double x, double y, double z)
{
this.entity = entity;
@@ -59,14 +53,10 @@ public abstract class RenderLivingEvent<T extends EntityLivingBase> extends net.
@net.minecraftforge.eventbus.api.Cancelable
public static class Pre<T extends EntityLivingBase> extends RenderLivingEvent<T>
{
@Deprecated
public Pre(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Pre(EntityLivingBase entity, RenderLivingBase<T> renderer, float partialRenderTick, double x, double y, double z){ super(entity, renderer, partialRenderTick, x, y, z); }
}
public static class Post<T extends EntityLivingBase> extends RenderLivingEvent<T>
{
@Deprecated
public Post(EntityLivingBase entity, RenderLivingBase<T> renderer, double x, double y, double z){ super(entity, renderer, x, y, z); }
public Post(EntityLivingBase entity, RenderLivingBase<T> renderer, float partialRenderTick, double x, double y, double z){ super(entity, renderer, partialRenderTick, x, y, z); }
}
@@ -55,84 +55,11 @@ public abstract class RenderPlayerEvent extends PlayerEvent
public static class Pre extends RenderPlayerEvent
{
public Pre(EntityPlayer player, RenderPlayer renderer, float tick, double x, double y, double z){ super(player, renderer, tick, x, y, z); }
@Deprecated
public Pre(EntityPlayer player, RenderPlayer renderer, float tick){ this(player, renderer, tick, 0D, 0D, 0D); }
}
public static class Post extends RenderPlayerEvent
{
public Post(EntityPlayer player, RenderPlayer renderer, float tick, double x, double y, double z){ super(player, renderer, tick, x, y, z); }
@Deprecated
public Post(EntityPlayer player, RenderPlayer renderer, float tick){ this(player, renderer, tick, 0D, 0D, 0D); }
}
@Deprecated
public abstract static class Specials extends RenderPlayerEvent
{
public Specials(EntityPlayer player, RenderPlayer renderer, float partialTicks)
{
super(player, renderer, partialTicks, 0D, 0D, 0D);
}
@net.minecraftforge.eventbus.api.Cancelable
public static class Pre extends Specials
{
private boolean renderHelmet = true;
private boolean renderCape = true;
private boolean renderItem = true;
public Pre(EntityPlayer player, RenderPlayer renderer, float partialTicks){ super(player, renderer, partialTicks); }
public boolean shouldRenderHelmet() { return renderHelmet; }
public void setRenderHelmet(boolean renderHelmet) { this.renderHelmet = renderHelmet; }
public boolean shouldRenderCape() { return renderCape; }
public void setRenderCape(boolean renderCape) { this.renderCape = renderCape; }
public boolean shouldRenderItem() { return renderItem; }
public void setRenderItem(boolean renderItem) { this.renderItem = renderItem; }
}
public static class Post extends Specials
{
public Post(EntityPlayer player, RenderPlayer renderer, float partialTicks){ super(player, renderer, partialTicks); }
}
}
@Deprecated
public static class SetArmorModel extends RenderPlayerEvent
{
private int result = -1;
private final int slot;
@Nonnull
private final ItemStack stack;
public SetArmorModel(EntityPlayer player, RenderPlayer renderer, int slot, float partialTick, @Nonnull ItemStack stack)
{
super(player, renderer, partialTick, 0D, 0D, 0D);
this.slot = slot;
this.stack = stack;
}
/**
* Setting this to any value besides -1 will result in the function being
* Immediately exited with the return value specified.
*/
public int getResultValue()
{
return result;
}
public void setResult(int result)
{
this.result = result;
}
public int getSlot()
{
return slot;
}
@Nonnull
public ItemStack getStack()
{
return stack;
}
}
}
@@ -222,13 +222,6 @@ public final class MultiModel implements IUnbakedModel
private final IUnbakedModel base;
private final Map<String, Pair<IUnbakedModel, IModelState>> parts;
// TODO 1.13 remove, kept for binary compatibility
@Deprecated
public MultiModel(ResourceLocation location, @Nullable IUnbakedModel base, IModelState baseState, ImmutableMap<String, Pair<IUnbakedModel, IModelState>> parts)
{
this(location, base, parts);
}
public MultiModel(ResourceLocation location, @Nullable IUnbakedModel base, ImmutableMap<String, Pair<IUnbakedModel, IModelState>> parts)
{
this.location = location;
@@ -236,13 +229,6 @@ public final class MultiModel implements IUnbakedModel
this.parts = parts;
}
// TODO 1.13 remove, kept for binary compatibility
@Deprecated
public MultiModel(ResourceLocation location, IUnbakedModel base, IModelState baseState, Map<String, Pair<IUnbakedModel, IModelState>> parts)
{
this(location, base, parts);
}
public MultiModel(ResourceLocation location, IUnbakedModel base, Map<String, Pair<IUnbakedModel, IModelState>> parts)
{
this(location, base, ImmutableMap.copyOf(parts));
@@ -44,12 +44,6 @@ public enum KeyModifier {
}
}
@Override
public boolean isActive()
{
return GuiScreen.isCtrlKeyDown();
}
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
@@ -71,12 +65,6 @@ public enum KeyModifier {
return key.getKeyCode() == GLFW.GLFW_KEY_LEFT_SHIFT || key.getKeyCode() == GLFW.GLFW_KEY_RIGHT_SHIFT;
}
@Override
public boolean isActive()
{
return GuiScreen.isShiftKeyDown();
}
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
@@ -96,12 +84,6 @@ public enum KeyModifier {
return key.getKeyCode() == GLFW.GLFW_KEY_LEFT_ALT || key.getKeyCode() == GLFW.GLFW_KEY_RIGHT_ALT;
}
@Override
public boolean isActive()
{
return GuiScreen.isAltKeyDown();
}
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
@@ -121,12 +103,6 @@ public enum KeyModifier {
return false;
}
@Override
public boolean isActive()
{
return true;
}
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
@@ -190,12 +166,6 @@ public enum KeyModifier {
public abstract boolean matches(InputMappings.Input key);
/**
* @deprecated use {@link #isActive(IKeyConflictContext)}
*/
@Deprecated
public abstract boolean isActive();
public abstract boolean isActive(@Nullable IKeyConflictContext conflictContext);
public abstract String getLocalizedComboName(InputMappings.Input key);