Skip to content
This repository has been archived by the owner on Mar 9, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cloak-fix' into 1.10.2-merged
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/main/java/am2/trackers/PlayerTracker.java
  • Loading branch information
@jjtParadox
jjtParadox committed Nov 27, 2017
2 parents e3a16ab + 666c401 commit 1205aac
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 122 deletions.
215 changes: 107 additions & 108 deletions src/main/java/am2/particles/ParticleManagerClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,32 +394,32 @@ public void handleClientPacketData(World world, byte[] data){
}
}

// @Override
// public void spawnAuraParticles(EntityLivingBase ent){
// if (!ent.worldObj.isRemote) return;
//
// int particleIndex = 15;
// int particleBehaviour = 0;
// float particleScale = 0;
// float particleAlpha = 0;
// boolean particleDefaultColor = true;
// boolean particleRandomColor = true;
// int particleColor = 0xFFFFFF;
// int particleQuantity = 2;
// float particleSpeed = 0.02f;
//
// if (Minecraft.getMinecraft().thePlayer == ent){
// particleIndex = AMCore.config.getAuraIndex();
// particleBehaviour = AMCore.config.getAuraBehaviour();
// particleScale = AMCore.config.getAuraScale() / 10;
// particleAlpha = AMCore.config.getAuraAlpha();
// particleDefaultColor = AMCore.config.getAuraColorDefault();
// particleRandomColor = AMCore.config.getAuraColorRandom();
// particleColor = AMCore.config.getAuraColor();
// particleQuantity = AMCore.config.getAuraQuantity();
// particleSpeed = AMCore.config.getAuraSpeed() / 10;
@Override
public void spawnAuraParticles(EntityLivingBase ent){
if (!ent.worldObj.isRemote) return;

int particleIndex = 15;
int particleBehaviour = 0;
float particleScale = 0;
float particleAlpha = 0;
boolean particleDefaultColor = true;
boolean particleRandomColor = true;
int particleColor = 0xFFFFFF;
int particleQuantity = 2;
float particleSpeed = 0.02f;

if (Minecraft.getMinecraft().thePlayer == ent){
particleIndex = ArsMagica2.config.getAuraIndex();
particleBehaviour = ArsMagica2.config.getAuraBehaviour();
particleScale = ArsMagica2.config.getAuraScale() / 10;
particleAlpha = ArsMagica2.config.getAuraAlpha();
particleDefaultColor = ArsMagica2.config.getAuraColorDefault();
particleRandomColor = ArsMagica2.config.getAuraColorRandom();
particleColor = ArsMagica2.config.getAuraColor();
particleQuantity = ArsMagica2.config.getAuraQuantity();
particleSpeed = ArsMagica2.config.getAuraSpeed() / 10;
// }else{
// ExtendedProperties entProperties = ExtendedProperties.For(ent);
// EntityExtension entProperties = EntityExtension.For(ent);
// particleIndex = entProperties.getAuraIndex();
// particleBehaviour = entProperties.getAuraBehaviour();
// particleScale = entProperties.getAuraScale() / 10;
Expand All @@ -429,89 +429,88 @@ public void handleClientPacketData(World world, byte[] data){
// particleColor = entProperties.getAuraColor();
// particleQuantity = entProperties.getAuraQuantity();
// particleSpeed = entProperties.getAuraSpeed() / 10;
// }
//
// if (particleIndex == 31) //fix radiant particle's scaling issues...
// particleScale /= 10;
//
// if (ent.worldObj.isRemote && ent instanceof EntityPlayer && AMCore.proxy.playerTracker.hasAA((EntityPlayer)ent)){
// if (Minecraft.getMinecraft().thePlayer != ent || Minecraft.getMinecraft().gameSettings.thirdPersonView > 0){
// if (AMParticle.particleTypes[particleIndex].startsWith("lightning_bolts")){
// int type = Integer.parseInt(new String(new char[]{AMParticle.particleTypes[particleIndex].charAt(AMParticle.particleTypes[particleIndex].length() - 1)}));
// if (ent.worldObj.rand.nextInt(100) < 90){
// BoltFromPointToPoint(ent.worldObj,
// ent.posX + (ent.worldObj.rand.nextFloat() - 0.5f),
// ent.posY + ent.getEyeHeight() - ent.height + (ent.worldObj.rand.nextFloat() * ent.height),
// ent.posZ + (ent.worldObj.rand.nextFloat() - 0.5f),
// ent.posX + (ent.worldObj.rand.nextFloat() - 0.5f),
// ent.posY + ent.getEyeHeight() - ent.height + (ent.worldObj.rand.nextFloat() * ent.height),
// ent.posZ + (ent.worldObj.rand.nextFloat() - 0.5f),
// type, -1);
// }else{
// BoltFromPointToPoint(ent.worldObj,
// ent.posX,
// ent.posY + ent.getEyeHeight() - 0.4,
// ent.posZ,
// ent.posX + (ent.worldObj.rand.nextFloat() * 10 - 5),
// ent.posY + (ent.worldObj.rand.nextFloat() * 10 - 5),
// ent.posZ + (ent.worldObj.rand.nextFloat() * 10 - 5),
// type, -1);
// }
// }else{
// int offset = 0;
// for (int i = 0; i < particleQuantity; ++i){
// AMParticle effect = spawn(ent.worldObj, AMParticle.particleTypes[particleIndex],
// ent.posX + (ent.worldObj.rand.nextFloat() - 0.5f),
// ent.posY + ent.getEyeHeight() - 0.5f + offset - (ent.worldObj.rand.nextFloat() * 0.5),
// ent.posZ + (ent.worldObj.rand.nextFloat() - 0.5f));
// if (effect != null){
// effect.setIgnoreMaxAge(false);
// effect.setMaxAge(40);
// effect.setParticleScale(particleScale);
// effect.SetParticleAlpha(particleAlpha);
// effect.noClip = false;
// if (!particleDefaultColor){
// if (particleRandomColor){
// effect.setRGBColorF(ent.worldObj.rand.nextFloat(), ent.worldObj.rand.nextFloat(), ent.worldObj.rand.nextFloat());
// }else{
// effect.setRGBColorI(particleColor);
// }
// }
// switch (particleBehaviour){
// case 0: //fade
// effect.AddParticleController(new ParticleFadeOut(effect, 1, false).setFadeSpeed(particleSpeed));
// break;
// case 1: //float
// effect.AddParticleController(new ParticleFloatUpward(effect, 0.2f, particleSpeed, 1, false));
// break;
// case 2: //sink
// effect.AddParticleController(new ParticleFloatUpward(effect, 0.2f, -particleSpeed, 1, false));
// break;
// case 3: //orbit
// effect.AddParticleController(new ParticleOrbitEntity(effect, ent, particleSpeed, 1, false));
// break;
// case 4: //arc
// effect.AddParticleController(new ParticleArcToEntity(effect, 1, ent, false).generateControlPoints().SetSpeed(particleSpeed));
// break;
// case 5: //flee
// effect.AddParticleController(new ParticleFleeEntity(effect, ent, particleSpeed, 2D, 1, false));
// break;
// case 6: //forward
// effect.AddParticleController(new ParticleMoveOnHeading(effect, ent.rotationYaw + 90, ent.rotationPitch, particleSpeed, 1, false));
// break;
// case 7: //pendulum
// effect.AddParticleController(new ParticlePendulum(effect, 0.2f, particleSpeed, 1, false));
// break;
// case 8: //grow
// effect.AddParticleController(new ParticleGrow(effect, particleSpeed, 1, false));
// break;
// }
// }
// }
// }
// }
// }
// }
}

if (particleIndex == 31) //fix radiant particle's scaling issues...
particleScale /= 10;

if (ent.worldObj.isRemote && ent instanceof EntityPlayer && ArsMagica2.proxy.playerTracker.hasAA((EntityPlayer)ent)){
if (Minecraft.getMinecraft().thePlayer != ent || Minecraft.getMinecraft().gameSettings.thirdPersonView > 0){
if (AMParticle.particleTypes[particleIndex].startsWith("lightning_bolts")){
int type = Integer.parseInt(new String(new char[]{AMParticle.particleTypes[particleIndex].charAt(AMParticle.particleTypes[particleIndex].length() - 1)}));
if (ent.worldObj.rand.nextInt(100) < 90){
BoltFromPointToPoint(ent.worldObj,
ent.posX + (ent.worldObj.rand.nextFloat() - 0.5f),
ent.posY + ent.getEyeHeight() - ent.height + (ent.worldObj.rand.nextFloat() * ent.height),
ent.posZ + (ent.worldObj.rand.nextFloat() - 0.5f),
ent.posX + (ent.worldObj.rand.nextFloat() - 0.5f),
ent.posY + ent.getEyeHeight() - ent.height + (ent.worldObj.rand.nextFloat() * ent.height),
ent.posZ + (ent.worldObj.rand.nextFloat() - 0.5f),
type, -1);
}else{
BoltFromPointToPoint(ent.worldObj,
ent.posX,
ent.posY + ent.getEyeHeight() - 0.4,
ent.posZ,
ent.posX + (ent.worldObj.rand.nextFloat() * 10 - 5),
ent.posY + (ent.worldObj.rand.nextFloat() * 10 - 5),
ent.posZ + (ent.worldObj.rand.nextFloat() * 10 - 5),
type, -1);
}
}else{
int offset = 0;
for (int i = 0; i < particleQuantity; ++i){
AMParticle effect = spawn(ent.worldObj, AMParticle.particleTypes[particleIndex],
ent.posX + (ent.worldObj.rand.nextFloat() - 0.5f),
ent.posY + ent.getEyeHeight() - 0.5f + offset - (ent.worldObj.rand.nextFloat() * 0.5),
ent.posZ + (ent.worldObj.rand.nextFloat() - 0.5f));
if (effect != null){
effect.setIgnoreMaxAge(false);
effect.setMaxAge(40);
effect.setParticleScale(particleScale);
effect.SetParticleAlpha(particleAlpha);
if (!particleDefaultColor){
if (particleRandomColor){
effect.setRGBColorF(ent.worldObj.rand.nextFloat(), ent.worldObj.rand.nextFloat(), ent.worldObj.rand.nextFloat());
}else{
effect.setRGBColorI(particleColor);
}
}
switch (particleBehaviour){
case 0: //fade
effect.AddParticleController(new ParticleFadeOut(effect, 1, false).setFadeSpeed(particleSpeed));
break;
case 1: //float
effect.AddParticleController(new ParticleFloatUpward(effect, 0.2f, particleSpeed, 1, false));
break;
case 2: //sink
effect.AddParticleController(new ParticleFloatUpward(effect, 0.2f, -particleSpeed, 1, false));
break;
case 3: //orbit
effect.AddParticleController(new ParticleOrbitEntity(effect, ent, particleSpeed, 1, false));
break;
case 4: //arc
effect.AddParticleController(new ParticleArcToEntity(effect, 1, ent, false).generateControlPoints().SetSpeed(particleSpeed));
break;
case 5: //flee
effect.AddParticleController(new ParticleFleeEntity(effect, ent, particleSpeed, 2D, 1, false));
break;
case 6: //forward
effect.AddParticleController(new ParticleMoveOnHeading(effect, ent.rotationYaw + 90, ent.rotationPitch, particleSpeed, 1, false));
break;
case 7: //pendulum
effect.AddParticleController(new ParticlePendulum(effect, 0.2f, particleSpeed, 1, false));
break;
case 8: //grow
effect.AddParticleController(new ParticleGrow(effect, particleSpeed, 1, false));
break;
}
}
}
}
}
}
}

@Override
public void spawnBuffParticles(EntityLivingBase entityliving){
Expand Down
25 changes: 11 additions & 14 deletions src/main/java/am2/trackers/PlayerTracker.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package am2.trackers;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.TreeMap;
Expand Down Expand Up @@ -28,9 +29,7 @@
import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;

import net.minecraftforge.event.entity.player.PlayerWakeUpEvent;
import scala.actors.threadpool.Arrays;

public class PlayerTracker{

Expand Down Expand Up @@ -83,7 +82,7 @@ public void onPlayerLogout(PlayerLoggedOutEvent event){
}
}
}

@SubscribeEvent
public void onPlayerWake(PlayerWakeUpEvent event){
if (ArsMagica2.config.getWakingRegen())
Expand Down Expand Up @@ -171,24 +170,22 @@ public boolean hasAA(EntityPlayer entity){
}

public int getAAL(EntityPlayer thePlayer){
try{
thePlayer.getDisplayName();
}catch (Throwable t){
return 0;
}

if (aals == null || clls == null)
populateAALList();
if (aals.containsKey(thePlayer.getDisplayName().getUnformattedText().toLowerCase()))
return aals.get(thePlayer.getDisplayName().getUnformattedText().toLowerCase());
if (aals.containsKey(thePlayer.getUniqueID().toString().toLowerCase()))
return aals.get(thePlayer.getUniqueID().toString().toLowerCase());
return 0;
}

private ArrayList<String> addContributors(ArrayList<String> lines){
//Growlith
lines.add("95ca1edb-b0d6-46a8-825d-2299763f03f0, :AL,3, :CL,http://i.imgur.com/QBCa5O0.png,6,growlith1223");
lines.add("95ca1edb-b0d6-46a8-825d-2299763f03f0,:AL,3,:CL,http://i.imgur.com/QBCa5O0.png,6,growlith1223");
//EdwinMindcraft
lines.add("2c809085-de5b-4580-9b5e-64bc33dcebee,:AL,3,:CL,http://i.imgur.com/QBCa5O0.png,6,edwinmindcraft");
//JJT
lines.add("6b93546d-100a-403d-b352-f2bf75fd3b0c, :AL,3 :CL,http://i.imgur.com/QBCa5O0.png,6,jjtparadox");
lines.add("6b93546d-100a-403d-b352-f2bf75fd3b0c,:CL,http://i.imgur.com/QBCa5O0.png,6,jjtparadox");
//The_Icy_One
lines.add("a08eaa4a-e3df-416d-9ced-d6d4fcd0e88b,:CL,http://i.imgur.com/QBCa5O0.png,6,the_icy_one");
return lines;
}

Expand All @@ -198,7 +195,7 @@ private void populateAALList(){
clls = new TreeMap<String, String>();
cldm = new TreeMap<String, Integer>();

String dls = "http://qorconcept.com/mc/AREW0152.txt";
String dls = "https://qorconcept.com/mc/AREW0152.txt";
char[] dl = dls.toCharArray();


Expand Down

0 comments on commit 1205aac

Please sign in to comment.