Skip to content

Commit fc796c0

Browse files
ROMVoid95ROMVoid95
committed
style: removed 'par#' prefix from params
1 parent d2c1432 commit fc796c0

File tree

66 files changed

+301
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+301
-204
lines changed

‎src/main/java/micdoodle8/mods/galacticraft/core/GCBlocks.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@ public static void oreDictRegistrations()
321321
OreDictionary.registerOre("blockSilicon", new ItemStack(GCBlocks.basicBlock, 1, 13));
322322

323323
OreDictionary.registerOre("turfMoon", new ItemStack(GCBlocks.blockMoon, 1, EnumBlockBasicMoon.MOON_TURF.getMeta()));
324+
OreDictionary.registerOre("itemCharcoal", new ItemStack(Items.COAL, 1, 1));
325+
OreDictionary.registerOre("itemCoal", new ItemStack(Items.COAL, 1));
324326
}
325327

326328
public static void finalizeSort()

‎src/main/java/micdoodle8/mods/galacticraft/core/client/sounds/SoundUpdaterRocket.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public class SoundUpdaterRocket extends MovingSound
2929
private boolean soundStopped;
3030
private boolean ignition = false;
3131

32-
public SoundUpdaterRocket(EntityPlayerSP par1EntityPlayerSP, EntityAutoRocket par2Entity)
32+
public SoundUpdaterRocket(EntityPlayerSP entityPlayerSP, EntityAutoRocket par2Entity)
3333
{
3434
super(GCSounds.shuttle, SoundCategory.NEUTRAL);
3535
this.theRocket = par2Entity;
36-
this.thePlayer = par1EntityPlayerSP;
36+
this.thePlayer = entityPlayerSP;
3737
this.attenuationType = ISound.AttenuationType.NONE;
3838
this.volume = 0.00001F; // If it's zero it won't start playing
3939
this.pitch = 0.0F; // pitch

‎src/main/java/micdoodle8/mods/galacticraft/core/entities/EntityMeteorChunk.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,21 +422,21 @@ protected void writeEntityToNBT(NBTTagCompound nbttagcompound)
422422
}
423423

424424
@Override
425-
public void onCollideWithPlayer(EntityPlayer par1EntityPlayer)
425+
public void onCollideWithPlayer(EntityPlayer entityPlayer)
426426
{
427427
if (!this.world.isRemote && this.inGround)
428428
{
429-
boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode;
429+
boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && entityPlayer.capabilities.isCreativeMode;
430430

431-
if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(new ItemStack(GCItems.meteorChunk, 1, 0)))
431+
if (this.canBePickedUp == 1 && !entityPlayer.inventory.addItemStackToInventory(new ItemStack(GCItems.meteorChunk, 1, 0)))
432432
{
433433
flag = false;
434434
}
435435

436436
if (flag)
437437
{
438438
this.playSound(SoundEvents.ENTITY_ITEM_PICKUP, 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
439-
par1EntityPlayer.onItemPickup(this, 1);
439+
entityPlayer.onItemPickup(this, 1);
440440
this.setDead();
441441
}
442442
}

‎src/main/java/micdoodle8/mods/galacticraft/core/entities/EntitySkeletonBoss.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,21 @@ public void knockBack(Entity par1Entity, float par2, double par3, double par5)
142142
}
143143

144144
@Override
145-
public void onCollideWithPlayer(EntityPlayer par1EntityPlayer)
145+
public void onCollideWithPlayer(EntityPlayer entityPlayer)
146146
{
147-
if (!this.isAIDisabled() && this.getPassengers().isEmpty() && this.postThrowDelay == 0 && this.throwTimer == 0 && par1EntityPlayer.equals(this.targetEntity) && this.deathTicks == 0)
147+
if (!this.isAIDisabled() && this.getPassengers().isEmpty() && this.postThrowDelay == 0 && this.throwTimer == 0 && entityPlayer.equals(this.targetEntity) && this.deathTicks == 0)
148148
{
149149
if (!this.world.isRemote)
150150
{
151151
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOSS_LAUGH, GCCoreUtil.getDimensionID(this.world), new Object[]
152152
{}), new TargetPoint(GCCoreUtil.getDimensionID(this.world), this.posX, this.posY, this.posZ, 40.0D));
153-
par1EntityPlayer.startRiding(this);
153+
entityPlayer.startRiding(this);
154154
}
155155

156156
this.throwTimer = 40;
157157
}
158158

159-
super.onCollideWithPlayer(par1EntityPlayer);
159+
super.onCollideWithPlayer(entityPlayer);
160160
}
161161

162162
@Override

‎src/main/java/micdoodle8/mods/galacticraft/core/entities/EntityTier1Rocket.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ protected void spawnParticles(boolean launched)
224224
}
225225

226226
@Override
227-
public boolean isUsableByPlayer(EntityPlayer par1EntityPlayer)
227+
public boolean isUsableByPlayer(EntityPlayer entityPlayer)
228228
{
229-
return !this.isDead && par1EntityPlayer.getDistanceSq(this) <= 64.0D;
229+
return !this.isDead && entityPlayer.getDistanceSq(this) <= 64.0D;
230230
}
231231

232232
@Override

‎src/main/java/micdoodle8/mods/galacticraft/core/entities/player/StatsCapability.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.lang.ref.WeakReference;
1111
import java.util.ArrayList;
12+
import java.util.Arrays;
1213
import java.util.Collections;
1314
import java.util.HashMap;
1415
import java.util.LinkedList;
@@ -1025,6 +1026,8 @@ public void saveNBTData(NBTTagCompound nbt)
10251026

10261027
Collections.sort(this.unlockedSchematics);
10271028

1029+
Arrays.sort(new int[6]);
1030+
10281031
NBTTagList tagList = new NBTTagList();
10291032

10301033
for (ISchematicPage page : this.unlockedSchematics)

‎src/main/java/micdoodle8/mods/galacticraft/core/inventory/ContainerBuggy.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ public ContainerBuggy(IInventory par1IInventory, IInventory par2IInventory, int
5454
}
5555

5656
@Override
57-
public boolean canInteractWith(EntityPlayer par1EntityPlayer)
57+
public boolean canInteractWith(EntityPlayer entityPlayer)
5858
{
59-
return this.spaceshipInv.isUsableByPlayer(par1EntityPlayer);
59+
return this.spaceshipInv.isUsableByPlayer(entityPlayer);
6060
}
6161

6262
/**
6363
* Called when a player shift-clicks on a slot. You must override this or
6464
* you will crash when someone does that.
6565
*/
6666
@Override
67-
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
67+
public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int par2)
6868
{
6969
ItemStack var3 = ItemStack.EMPTY;
7070
final Slot var4 = (Slot) this.inventorySlots.get(par2);
@@ -102,10 +102,10 @@ public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
102102
* Callback for when the crafting gui is closed.
103103
*/
104104
@Override
105-
public void onContainerClosed(EntityPlayer par1EntityPlayer)
105+
public void onContainerClosed(EntityPlayer entityPlayer)
106106
{
107-
super.onContainerClosed(par1EntityPlayer);
108-
this.lowerChestInventory.closeInventory(par1EntityPlayer);
107+
super.onContainerClosed(entityPlayer);
108+
this.lowerChestInventory.closeInventory(entityPlayer);
109109
}
110110

111111
/**

‎src/main/java/micdoodle8/mods/galacticraft/core/inventory/ContainerBuggyBench.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public ContainerBuggyBench(InventoryPlayer par1InventoryPlayer, BlockPos pos, En
7878
}
7979

8080
@Override
81-
public void onContainerClosed(EntityPlayer par1EntityPlayer)
81+
public void onContainerClosed(EntityPlayer entityPlayer)
8282
{
83-
super.onContainerClosed(par1EntityPlayer);
83+
super.onContainerClosed(entityPlayer);
8484

8585
if (!this.world.isRemote)
8686
{
@@ -90,7 +90,7 @@ public void onContainerClosed(EntityPlayer par1EntityPlayer)
9090

9191
if (!slot.isEmpty())
9292
{
93-
par1EntityPlayer.entityDropItem(slot, 0.0F);
93+
entityPlayer.entityDropItem(slot, 0.0F);
9494
}
9595
}
9696
}
@@ -103,7 +103,7 @@ public void onCraftMatrixChanged(IInventory par1IInventory)
103103
}
104104

105105
@Override
106-
public boolean canInteractWith(EntityPlayer par1EntityPlayer)
106+
public boolean canInteractWith(EntityPlayer entityPlayer)
107107
{
108108
return true;
109109
}
@@ -113,7 +113,7 @@ public boolean canInteractWith(EntityPlayer par1EntityPlayer)
113113
* clicking.
114114
*/
115115
@Override
116-
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par1)
116+
public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int par1)
117117
{
118118
ItemStack var2 = ItemStack.EMPTY;
119119
final Slot slot = (Slot) this.inventorySlots.get(par1);
@@ -176,7 +176,7 @@ public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par1)
176176
}
177177

178178
slot.onSlotChanged();
179-
slot.onTake(par1EntityPlayer, var4);
179+
slot.onTake(entityPlayer, var4);
180180
}
181181

182182
return var2;

‎src/main/java/micdoodle8/mods/galacticraft/core/inventory/ContainerCargoLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public boolean canInteractWith(EntityPlayer var1)
8080
}
8181

8282
@Override
83-
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
83+
public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int par2)
8484
{
8585
ItemStack var3 = ItemStack.EMPTY;
8686
final Slot slot = this.inventorySlots.get(par2);
@@ -129,7 +129,7 @@ public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
129129
return ItemStack.EMPTY;
130130
}
131131

132-
slot.onTake(par1EntityPlayer, var5);
132+
slot.onTake(entityPlayer, var5);
133133
}
134134

135135
return var3;

‎src/main/java/micdoodle8/mods/galacticraft/core/inventory/ContainerCircuitFabricator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public ContainerCircuitFabricator(InventoryPlayer playerInv, TileEntityCircuitFa
7878
}
7979

8080
@Override
81-
public boolean canInteractWith(EntityPlayer par1EntityPlayer)
81+
public boolean canInteractWith(EntityPlayer entityPlayer)
8282
{
83-
return this.tileEntity.isUsableByPlayer(par1EntityPlayer);
83+
return this.tileEntity.isUsableByPlayer(entityPlayer);
8484
}
8585

8686
@Override
@@ -94,7 +94,7 @@ public void onCraftMatrixChanged(IInventory par1IInventory)
9494
* clicking.
9595
*/
9696
@Override
97-
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par1)
97+
public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int par1)
9898
{
9999
ItemStack var2 = ItemStack.EMPTY;
100100
Slot slot = this.inventorySlots.get(par1);
@@ -174,7 +174,7 @@ public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par1)
174174
return ItemStack.EMPTY;
175175
}
176176

177-
slot.onTake(par1EntityPlayer, var4);
177+
slot.onTake(entityPlayer, var4);
178178
}
179179

180180
return var2;

0 commit comments

Comments
 (0)