10 more rejects down.

98 errors 6 rejects left.
This commit is contained in:
LexManos committed 2016-03-07 23:34:40 -08:00
1 parent 26ca27193c
commit 776eb00ed3
40 files changed
+400 -576

No files matched your search

@@ -3,7 +3,6 @@ package net.minecraftforge.client.event;
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.math.RayTraceResult;
import net.minecraft.client.renderer.RenderGlobal;
@@ -16,7 +15,7 @@ public class DrawBlockHighlightEvent extends Event
public final int subID;
public final float partialTicks;
public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, ItemStack currentItem, float partialTicks)
public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, float partialTicks)
{
this.context = context;
this.player = player;
@@ -28,7 +28,9 @@ public class RenderGameOverlayEvent extends Event
JUMPBAR,
CHAT,
PLAYER_LIST,
DEBUG
DEBUG,
POTION_ICONS,
SUBTITLES
}
public final float partialTicks;
@@ -1,16 +0,0 @@
package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
import net.minecraft.client.audio.SoundPoolEntry;
/**
* Raised when the SoundManager tries to play a Background Music file,
* If you return null from this function it will prevent the sound from being played,
* you can return a different entry if you want to change the sound being played.
*/
@Deprecated // Remove in 1.8
public class PlayBackgroundMusicEvent extends SoundResultEvent
{
public PlayBackgroundMusicEvent(SoundManager manager, SoundPoolEntry entry)
{ super(manager, entry, null, 0.0f, 0.0f); }
}
@@ -1,11 +0,0 @@
package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
import net.minecraft.client.audio.SoundPoolEntry;
@Deprecated //Remove in 1.8
public class PlaySoundEffectEvent extends SoundResultEvent
{
public PlaySoundEffectEvent(SoundManager manager, SoundPoolEntry source, String name, float volume, float pitch)
{ super(manager, source, name, volume, pitch); }
}
@@ -1,16 +0,0 @@
package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
@Deprecated //Remove in 1.8
public class PlaySoundEffectSourceEvent extends SoundEvent
{
public final SoundManager manager;
public final String name;
public PlaySoundEffectSourceEvent(SoundManager manager, String name)
{
super(manager);
this.manager = manager;
this.name = name;
}
}
@@ -1,7 +1,6 @@
package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.ISound;
import net.minecraft.client.audio.SoundCategory;
import net.minecraft.client.audio.SoundManager;
/***
@@ -14,14 +13,12 @@ public class PlaySoundEvent extends SoundEvent
{
public final String name;
public final ISound sound;
public final SoundCategory category;
public ISound result;
public PlaySoundEvent(SoundManager manager, ISound sound, SoundCategory category)
public PlaySoundEvent(SoundManager manager, ISound sound)
{
super(manager);
this.sound = sound;
this.category = category;
this.name = sound.getSoundLocation().getResourcePath();
this.result = sound;
}
@@ -1,27 +0,0 @@
package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
import net.minecraft.client.audio.SoundPoolEntry;
/**
* Raised when the SoundManager tries to play a 'Streaming' file,
* in vanilla it is only the Jukebox that uses this function.
*
* If you return null from this function it will prevent the sound from being played,
* you can return a different entry if you want to change the sound being played.
*
*/
@Deprecated
public class PlayStreamingEvent extends SoundResultEvent
{
public final float x;
public final float y;
public final float z;
public PlayStreamingEvent(SoundManager manager, SoundPoolEntry source, String name, float x, float y, float z)
{
super(manager, source, name, 0.0f, 0.0f);
this.x = x;
this.y = y;
this.z = z;
}
}
@@ -3,8 +3,6 @@ package net.minecraftforge.client.event.sound;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraft.client.audio.ISound;
import net.minecraft.client.audio.SoundManager;
import net.minecraft.client.audio.SoundPoolEntry;
import net.minecraftforge.common.MinecraftForge;
public class SoundEvent extends Event
{
@@ -14,13 +12,6 @@ public class SoundEvent extends Event
this.manager = manager;
}
@Deprecated
public static SoundPoolEntry getResult(SoundResultEvent event)
{
MinecraftForge.EVENT_BUS.post(event);
return event.result;
}
public static class SoundSourceEvent extends SoundEvent
{
public final ISound sound;
@@ -35,4 +26,4 @@ public class SoundEvent extends Event
this.uuid = uuid;
}
}
}
}
@@ -3,16 +3,13 @@ package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
/**
* Raised by the SoundManager.loadSoundSettings, this would be a good place for
* Raised by the SoundManager.loadSoundSettings, this would be a good place for
* adding your custom sounds to the SoundPool.
*/
public class SoundLoadEvent extends SoundEvent
{
@Deprecated
public final SoundManager manager;
public SoundLoadEvent(SoundManager manager)
{
super(manager);
this.manager = manager;
}
}
@@ -1,26 +0,0 @@
package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
import net.minecraft.client.audio.SoundPoolEntry;
@Deprecated //Remove in 1.8
public abstract class SoundResultEvent extends SoundEvent
{
public final SoundManager manager;
public final SoundPoolEntry source;
public final String name;
public final float volume;
public final float pitch;
public SoundPoolEntry result;
public SoundResultEvent(SoundManager manager, SoundPoolEntry source, String name, float volume, float pitch)
{
super(manager);
this.manager = manager;
this.source = source;
this.name = name;
this.volume = volume;
this.pitch = pitch;
this.result = source;
}
}
@@ -3,16 +3,13 @@ package net.minecraftforge.client.event.sound;
import net.minecraft.client.audio.SoundManager;
/**
* This event is raised by the SoundManager when it does its first setup of the
* This event is raised by the SoundManager when it does its first setup of the
* SoundSystemConfig's codecs, use this function to add your own codecs.
*/
public class SoundSetupEvent extends SoundEvent
{
@Deprecated
public final SoundManager manager;
public SoundSetupEvent(SoundManager manager)
{
super(manager);
this.manager = manager;
}
}