mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-14 01:14:18 +00:00
quick fix : 'if' can be replaced with 'switch'
This commit is contained in:
Alexdoru authored and Jason Mitchell committed
1 parent
9cfd723ea3
commit
4ad67bc34b
2 files changed
+380
-329
No files matched your search
@@ -107,17 +107,21 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon {
|
||||
double d8 = this.mc.renderViewEntity.posZ - par6;
|
||||
EntityFX entityfx = null;
|
||||
|
||||
if (par1Str.equals("hugeexplosion")) {
|
||||
this.mc.effectRenderer.addEffect(
|
||||
entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12));
|
||||
} else if (par1Str.equals("largeexplode")) {
|
||||
this.mc.effectRenderer.addEffect(
|
||||
entityfx = new EntityLargeExplodeFX(
|
||||
mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12));
|
||||
} else if (par1Str.equals("fireworksSpark")) {
|
||||
this.mc.effectRenderer.addEffect(
|
||||
entityfx = new EntityFireworkSparkFX(
|
||||
mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer));
|
||||
switch (par1Str) {
|
||||
case "hugeexplosion":
|
||||
this.mc.effectRenderer.addEffect(
|
||||
entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12));
|
||||
break;
|
||||
case "largeexplode":
|
||||
this.mc.effectRenderer.addEffect(
|
||||
entityfx = new EntityLargeExplodeFX(
|
||||
mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12));
|
||||
break;
|
||||
case "fireworksSpark":
|
||||
this.mc.effectRenderer.addEffect(
|
||||
entityfx = new EntityFireworkSparkFX(
|
||||
mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer));
|
||||
break;
|
||||
}
|
||||
|
||||
if (entityfx != null) {
|
||||
@@ -130,79 +134,110 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon {
|
||||
} else if (i > 1) {
|
||||
return null;
|
||||
} else {
|
||||
if (par1Str.equals("bubble")) {
|
||||
entityfx = new EntityBubbleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("suspended")) {
|
||||
entityfx = new EntitySuspendFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("depthsuspend")) {
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("townaura")) {
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("crit")) {
|
||||
entityfx = new EntityCritFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("smoke")) {
|
||||
entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("mobSpell")) {
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12);
|
||||
} else if (par1Str.equals("mobSpellAmbient")) {
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
((EntityFX) entityfx).setAlphaF(0.15F);
|
||||
((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12);
|
||||
} else if (par1Str.equals("spell")) {
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("instantSpell")) {
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144);
|
||||
} else if (par1Str.equals("witchMagic")) {
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144);
|
||||
float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F;
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f);
|
||||
} else if (par1Str.equals("note")) {
|
||||
entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("portal")) {
|
||||
entityfx = new EntityPortalFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("enchantmenttable")) {
|
||||
entityfx =
|
||||
new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("explode")) {
|
||||
entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("flame")) {
|
||||
entityfx = new EntityFlameFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("lava")) {
|
||||
entityfx = new EntityLavaFX(mc.theWorld, par2, par4, par6);
|
||||
} else if (par1Str.equals("footstep")) {
|
||||
entityfx = new EntityFootStepFX(mc.renderEngine, mc.theWorld, par2, par4, par6);
|
||||
} else if (par1Str.equals("splash")) {
|
||||
entityfx = new EntitySplashFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("largesmoke")) {
|
||||
entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12, 2.5F);
|
||||
} else if (par1Str.equals("cloud")) {
|
||||
entityfx = new EntityCloudFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("reddust")) {
|
||||
entityfx = new EntityReddustFX(
|
||||
mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12);
|
||||
} else if (par1Str.equals("snowballpoof")) {
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Items.snowball);
|
||||
} else if (par1Str.equals("dripWater")) {
|
||||
entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water);
|
||||
} else if (par1Str.equals("dripLava")) {
|
||||
entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava);
|
||||
} else if (par1Str.equals("snowshovel")) {
|
||||
entityfx = new EntitySnowShovelFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("blueslime")) {
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TinkerWorld.strangeFood);
|
||||
} else if (par1Str.equals("heart")) {
|
||||
entityfx = new EntityHeartFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
} else if (par1Str.equals("angryVillager")) {
|
||||
entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12);
|
||||
((EntityFX) entityfx).setParticleTextureIndex(81);
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F);
|
||||
} else if (par1Str.equals("happyVillager")) {
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntityFX) entityfx).setParticleTextureIndex(82);
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F);
|
||||
switch (par1Str) {
|
||||
case "bubble":
|
||||
entityfx = new EntityBubbleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "suspended":
|
||||
entityfx = new EntitySuspendFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "depthsuspend":
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "townaura":
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "crit":
|
||||
entityfx = new EntityCritFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "smoke":
|
||||
entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "mobSpell":
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12);
|
||||
break;
|
||||
case "mobSpellAmbient":
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
((EntityFX) entityfx).setAlphaF(0.15F);
|
||||
((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12);
|
||||
break;
|
||||
case "spell":
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "instantSpell":
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144);
|
||||
break;
|
||||
case "witchMagic":
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144);
|
||||
float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F;
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f);
|
||||
break;
|
||||
case "note":
|
||||
entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "portal":
|
||||
entityfx = new EntityPortalFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "enchantmenttable":
|
||||
entityfx =
|
||||
new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "explode":
|
||||
entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "flame":
|
||||
entityfx = new EntityFlameFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "lava":
|
||||
entityfx = new EntityLavaFX(mc.theWorld, par2, par4, par6);
|
||||
break;
|
||||
case "footstep":
|
||||
entityfx = new EntityFootStepFX(mc.renderEngine, mc.theWorld, par2, par4, par6);
|
||||
break;
|
||||
case "splash":
|
||||
entityfx = new EntitySplashFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "largesmoke":
|
||||
entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12, 2.5F);
|
||||
break;
|
||||
case "cloud":
|
||||
entityfx = new EntityCloudFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "reddust":
|
||||
entityfx = new EntityReddustFX(
|
||||
mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12);
|
||||
break;
|
||||
case "snowballpoof":
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Items.snowball);
|
||||
break;
|
||||
case "dripWater":
|
||||
entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water);
|
||||
break;
|
||||
case "dripLava":
|
||||
entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava);
|
||||
break;
|
||||
case "snowshovel":
|
||||
entityfx = new EntitySnowShovelFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "blueslime":
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TinkerWorld.strangeFood);
|
||||
break;
|
||||
case "heart":
|
||||
entityfx = new EntityHeartFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
break;
|
||||
case "angryVillager":
|
||||
entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12);
|
||||
((EntityFX) entityfx).setParticleTextureIndex(81);
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F);
|
||||
break;
|
||||
case "happyVillager":
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntityFX) entityfx).setParticleTextureIndex(82);
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F);
|
||||
break;
|
||||
}
|
||||
|
||||
if (entityfx != null) {
|
||||
|
||||
Reference in new issue
Block a user