Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

common directory changes from bloodasp code

Browse source
This commit is contained in:
Technus 2016-10-07 18:43:14 +02:00
parent c4a0de6674
commit aa45343168
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/gregtech/common/GT_Client.java
View file

@ -214,7 +214,9 @@ public class GT_Client extends GT_Proxy
GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true); GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true);
i++; i++;
} while (true); } while (true);
} catch (Throwable e) {e.printStackTrace(GT_Log.err);} } catch (Throwable e) {
e.printStackTrace(GT_Log.err);
}
// super.onPostLoad(); // super.onPostLoad();
@ -271,16 +273,21 @@ public class GT_Client extends GT_Proxy
} catch (Throwable e) { } catch (Throwable e) {
} }
} }
@SubscribeEvent
public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
}
@SubscribeEvent @SubscribeEvent
public void onPlayerTickEventClient(TickEvent.PlayerTickEvent aEvent) { public void onPlayerTickEventClient(TickEvent.PlayerTickEvent aEvent) {
if ((!aEvent.player.isDead) && (aEvent.phase == TickEvent.Phase.END) && (aEvent.side.isClient())) { if ((aEvent.side.isClient()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) {
ArrayList<GT_PlayedSound> tList = new ArrayList(); ArrayList<GT_PlayedSound> tList = new ArrayList();
for (Map.Entry<GT_PlayedSound, Integer> tEntry : GT_Utility.sPlayedSoundMap.entrySet()) { for (Map.Entry<GT_PlayedSound, Integer> tEntry : GT_Utility.sPlayedSoundMap.entrySet()) {
if (((Integer) tEntry.getValue()).intValue() < 0) { if (tEntry.getValue().intValue() < 0) {//Integer -> Integer -> int? >_<, fix
tList.add(tEntry.getKey()); tList.add(tEntry.getKey());
} else { } else {
tEntry.setValue(Integer.valueOf(((Integer) tEntry.getValue()).intValue() - 1)); tEntry.setValue(Integer.valueOf(tEntry.getValue().intValue() - 1));
} }
} }
GT_PlayedSound tKey; GT_PlayedSound tKey;
@ -346,17 +353,12 @@ public class GT_Client extends GT_Proxy
} }
} }
@SubscribeEvent
public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
}
@SubscribeEvent @SubscribeEvent
public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) { public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) {
if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) { if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) {
mAnimationTick++; mAnimationTick++;
if (mAnimationTick % 50L == 0L) if (mAnimationTick % 50L == 0L)
mAnimationDirection = !mAnimationDirection; {mAnimationDirection = !mAnimationDirection;}
int tDirection = mAnimationDirection ? 1 : -1; int tDirection = mAnimationDirection ? 1 : -1;
for (Iterator i$ = mPosR.iterator(); i$.hasNext(); ) { for (Iterator i$ = mPosR.iterator(); i$.hasNext(); ) {
Materials tMaterial = (Materials) i$.next(); Materials tMaterial = (Materials) i$.next();
@ -520,4 +522,4 @@ public class GT_Client extends GT_Proxy
else else
aWorld.playSound(aX, aY, aZ, tString, 3F, tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F, false); aWorld.playSound(aX, aY, aZ, tString, 3F, tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F, false);
} }
} }

2
src/main/java/gregtech/common/GT_Pollution.java
View file

@ -1,4 +1,4 @@
package gregtech.common; package gregtech.common;
import gregtech.GT_Mod; import gregtech.GT_Mod;
import gregtech.api.objects.XSTR; import gregtech.api.objects.XSTR;