Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging logs

Browse source
This commit is contained in:
LemADEC 2014-10-11 02:01:34 +02:00
parent 9453c88e21
commit 6cb73d59c7
8 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cr0s/WarpDrive/EntityJump.java
View file

@ -160,7 +160,7 @@ public class EntityJump extends Entity
}
if (!on) {
System.out.println("" + this + " Removing from onUpdate...");
WarpDrive.print(this + " Removing from onUpdate...");
worldObj.removeEntity(this);
return;
}
@ -174,7 +174,7 @@ public class EntityJump extends Entity
ticks++;
if (state == STATE_IDLE) {
WarpDrive.debugPrint("" + this + " Preparing to jump...");
WarpDrive.debugPrint(this + " Preparing to jump...");
prepareToJump();
if (on) {
state = STATE_JUMPING;
@ -299,7 +299,7 @@ public class EntityJump extends Entity
if (entitiesOnShip == null) {
reactor.messageToAllPlayersOnShip(msg);
} else {
System.out.println("" + this + " messageToAllPlayersOnShip: " + msg);
WarpDrive.print("" + this + " messageToAllPlayersOnShip: " + msg);
for (MovingEntity me : entitiesOnShip) {
if (me.entity instanceof EntityPlayer) {
((EntityPlayer)me.entity).addChatMessage("[" + ((reactor != null && reactor.coreFrequency.length() > 0) ? reactor.coreFrequency : "WarpCore") + "] " + msg);
@ -753,7 +753,7 @@ public class EntityJump extends Entity
WarpDrive.debugPrint("" + this + " Reporting " + collisionAtTarget.size() + " collisions coordinates "
+ blowPoints + " blowPoints with massCorrection of " + String.format("%.2f", massCorrection) + " => strength " + String.format("%.2f", collisionStrength) );
} else {
System.out.println("WarpDrive error: unable to compute collision points, ignoring...");
WarpDrive.print("WarpDrive error: unable to compute collision points, ignoring...");
}
}

2
src/cr0s/WarpDrive/LocalProfiler.java
View file

@ -41,6 +41,6 @@ public class LocalProfiler
long self = (dt - e.internal) / 1000; // in microseconds
long total = dt / 1000;
System.out.println("[PROF] {" + e.name + "} self: " + (self / 1000F) + "ms, total: " + (total / 1000F) + "ms");
WarpDrive.print("[PROF] {" + e.name + "} self: " + (self / 1000F) + "ms, total: " + (total / 1000F) + "ms");
}
}

2
src/cr0s/WarpDrive/SoundHandler.java
View file

@ -10,7 +10,7 @@ public class SoundHandler {
@ForgeSubscribe
public void onSoundLoad(SoundLoadEvent event) {
try {
System.out.println("[WarpDrive] Registering sound files...");
WarpDrive.debugPrint("[WarpDrive] Registering sound files...");
event.manager.addSound("warpdrive:warp_4s.ogg");
event.manager.addSound("warpdrive:warp_10s.ogg");
event.manager.addSound("warpdrive:warp_30s.ogg");

4
src/cr0s/WarpDrive/data/CamRegistry.java
View file

@ -109,10 +109,10 @@ public class CamRegistry {
}
public void printRegistry(World worldObj) {
System.out.println("Cameras registry for dimension " + worldObj.provider.dimensionId + ":");
WarpDrive.print("Cameras registry for dimension " + worldObj.provider.dimensionId + ":");
for (CamRegistryItem cam : registry) {
System.out.println("- " + cam.frequency + " (" + cam.position.x + ", " + cam.position.y + ", " + cam.position.z + ")");
WarpDrive.print("- " + cam.frequency + " (" + cam.position.x + ", " + cam.position.y + ", " + cam.position.z + ")");
}
}
}

8
src/cr0s/WarpDrive/data/JumpgatesRegistry.java
View file

@ -10,6 +10,8 @@ import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import cr0s.WarpDrive.WarpDrive;
public final class JumpgatesRegistry {
private File db;
private ArrayList<Jumpgate> gates = new ArrayList<Jumpgate>();
@ -17,7 +19,7 @@ public final class JumpgatesRegistry {
//@SideOnly(Side.CLIENT)
public JumpgatesRegistry() {
db = new File("gates.txt");
System.out.println("Gates.txt file: " + db);
WarpDrive.print("Gates.txt file: " + db);
if (db != null && !db.exists()) {
try {
@ -46,7 +48,7 @@ public final class JumpgatesRegistry {
}
public void loadGates() throws IOException {
System.out.println("[JUMP GATES] Loading jump gates from gates.txt...");
WarpDrive.print("[JUMP GATES] Loading jump gates from gates.txt...");
BufferedReader bufferedreader;
bufferedreader = new BufferedReader(new FileReader(db));
String s1;
@ -56,7 +58,7 @@ public final class JumpgatesRegistry {
}
bufferedreader.close();
System.out.println("[JUMP GATES] Loaded " + gates.size() + " jump gates.");
WarpDrive.print("[JUMP GATES] Loaded " + gates.size() + " jump gates.");
}
public void addGate(Jumpgate jg) {

4
src/cr0s/WarpDrive/machines/TileEntityProtocol.java
View file

@ -567,7 +567,7 @@ public class TileEntityProtocol extends WarpInterfacedTE {
if (argInt0 < 0 || argInt1 < 0 || argInt2 < 0) {
return new Integer[] { getFront(), getRight(), getUp() };
}
System.out.println("Setting positive gabarits: f: " + argInt0 + " r: " + argInt1 + " u: " + argInt2);
WarpDrive.debugPrint("Setting positive gabarits: f: " + argInt0 + " r: " + argInt1 + " u: " + argInt2);
setFront(argInt0);
setRight(argInt1);
setUp(argInt2);
@ -589,7 +589,7 @@ public class TileEntityProtocol extends WarpInterfacedTE {
if (argInt0 < 0 || argInt1 < 0 || argInt2 < 0) {
return new Integer[] { getBack(), getLeft(), getDown() };
}
System.out.println("Setting negative gabarits: b: " + argInt0 + " l: " + argInt1 + " d: " + argInt2);
WarpDrive.debugPrint("Setting negative gabarits: b: " + argInt0 + " l: " + argInt1 + " d: " + argInt2);
setBack(argInt0);
setLeft(argInt1);
setDown(argInt2);

4
src/cr0s/WarpDrive/machines/TileEntityShipScanner.java
View file

@ -344,8 +344,8 @@ public class TileEntityShipScanner extends WarpEnergyTE {
return true;
}
private static void writeNBTToFile(String fileName, NBTTagCompound nbttagcompound) {
System.out.println("[ShipScanner] Filename: " + fileName);
private void writeNBTToFile(String fileName, NBTTagCompound nbttagcompound) {
WarpDrive.print(this + " Filename: " + fileName);
try {
File file = new File(fileName);

10
src/cr0s/WarpDrive/render/ClientCameraUtils.java
View file

@ -19,11 +19,11 @@ public class ClientCameraUtils {
Minecraft mc = Minecraft.getMinecraft();
if (parPlayerEntity == null) {
System.out.println("[WarpDrive] setupViewpoint with null player => denied");
WarpDrive.print("[WarpDrive] setupViewpoint with null player => denied");
return;
}
if (entityCamera == null) {
System.out.println("[WarpDrive] setupViewpoint with null camera => denied");
WarpDrive.print("[WarpDrive] setupViewpoint with null camera => denied");
return;
}
@ -53,7 +53,7 @@ public class ClientCameraUtils {
entityPlayer = null;
WarpDrive.debugPrint("Resetting viewpoint");
} else {
System.out.println("[WarpDrive] reseting viewpoint with invalid player entity ?!?");
WarpDrive.print("[WarpDrive] reseting viewpoint with invalid player entity ?!?");
}
Keyboard.enableRepeatEvents(false);
@ -72,11 +72,11 @@ public class ClientCameraUtils {
return false;
}
if (worldObj.getBlockId(check1_x, check1_y, check1_z) != check1_blockId) {
System.out.println("[WarpDrive] checking viewpoint, found invalid block1 at (" + check1_x + ", " + check1_y + ", " + check1_z + ")");
WarpDrive.print("[WarpDrive] checking viewpoint, found invalid block1 at (" + check1_x + ", " + check1_y + ", " + check1_z + ")");
return false;
}
if (worldObj.getBlockId(check2_x, check2_y, check2_z) != check2_blockId) {
System.out.println("[WarpDrive] checking viewpoint, found invalid block2 at (" + check2_x + ", " + check2_y + ", " + check2_z + ")");
WarpDrive.print("[WarpDrive] checking viewpoint, found invalid block2 at (" + check2_x + ", " + check2_y + ", " + check2_z + ")");
return false;
}
return true;