aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/util/GTLog.java2
-rw-r--r--src/main/java/gregtech/common/GTPlayerActivityLogger.java34
-rw-r--r--src/main/java/gregtech/common/GTProxy.java59
-rw-r--r--src/main/java/gregtech/common/config/Gregtech.java7
-rw-r--r--src/main/java/gregtech/loaders/preload/GTPreLoad.java12
5 files changed, 1 insertions, 113 deletions
diff --git a/src/main/java/gregtech/api/util/GTLog.java b/src/main/java/gregtech/api/util/GTLog.java
index eba6b0fe50..d9365bbea9 100644
--- a/src/main/java/gregtech/api/util/GTLog.java
+++ b/src/main/java/gregtech/api/util/GTLog.java
@@ -16,11 +16,9 @@ public class GTLog {
public static PrintStream out = System.out;
public static PrintStream err = System.err;
public static PrintStream ore = new LogBuffer();
- public static PrintStream pal = null;
public static PrintStream exp = new LogBuffer();
public static File mLogFile;
public static File mOreDictLogFile;
- public static File mPlayerActivityLogFile;
public static File mExplosionLog;
public static class LogBuffer extends PrintStream {
diff --git a/src/main/java/gregtech/common/GTPlayerActivityLogger.java b/src/main/java/gregtech/common/GTPlayerActivityLogger.java
deleted file mode 100644
index 7bd5ba508e..0000000000
--- a/src/main/java/gregtech/common/GTPlayerActivityLogger.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gregtech.common;
-
-import java.util.ArrayList;
-
-import gregtech.GTMod;
-import gregtech.api.util.GTLog;
-
-public class GTPlayerActivityLogger implements Runnable {
-
- @Override
- public void run() {
- try {
- ArrayList<String> buffer = new ArrayList<>();
- for (;;) {
- if (GTLog.pal == null) {
- return;
- }
- String tLastOutput = "";
- // Block on first element for efficiency
- buffer.add(GTMod.gregtechproxy.mBufferedPlayerActivity.take());
- GTMod.gregtechproxy.mBufferedPlayerActivity.drainTo(buffer);
- for (String output : buffer) {
- if (!output.equals(tLastOutput)) {
- GTLog.pal.println(output);
- tLastOutput = output;
- }
- }
- buffer.clear();
- // TODO: swap from sleep to event bus
- Thread.sleep(10000L);
- }
- } catch (Throwable ignored) {}
- }
-}
diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java
index 8b2c153591..ed5ffeb4c8 100644
--- a/src/main/java/gregtech/common/GTProxy.java
+++ b/src/main/java/gregtech/common/GTProxy.java
@@ -36,11 +36,9 @@ import static gregtech.api.util.GTUtil.LAST_BROKEN_TILEENTITY;
import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
import java.io.File;
-import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -49,10 +47,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -535,8 +531,6 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
"infusedteslatiteInsulated",
"redalloyInsulated",
"infusedteslatiteBundled"));
- private final DateFormat mDateFormat = DateFormat.getInstance();
- public final BlockingQueue<String> mBufferedPlayerActivity = new LinkedBlockingQueue<>();
public final GTBlockMap<Boolean> mCTMBlockCache = new GTBlockMap<>();
public boolean mDisableVanillaOres = true;
public boolean mAllowSmallBoilerAutomation = false;
@@ -1226,13 +1220,6 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
public void onPostLoad() {
GTLog.out.println("GTMod: Beginning PostLoad-Phase.");
- GTLog.ore.println("GTMod: Beginning PostLoad-Phase.");
- if (GTLog.pal != null) {
- final Thread playerActivityLogger = new Thread(new GTPlayerActivityLogger());
- playerActivityLogger.setDaemon(true);
- playerActivityLogger.setName("GT5U Player activity logger");
- playerActivityLogger.start();
- }
GregTechAPI.sPostloadStarted = true;
// This needs to happen late enough that all of the fluids we need have been registered.
@@ -1531,10 +1518,6 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
}
}
- private String getDataAndTime() {
- return this.mDateFormat.format(new Date());
- }
-
@SubscribeEvent
public void onPlayerInteraction(PlayerInteractEvent aEvent) {
if ((aEvent.entityPlayer == null) || (aEvent.entityPlayer.worldObj == null)
@@ -1542,28 +1525,6 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
|| (aEvent.world.provider == null)) {
return;
}
- if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR)
- && (GTLog.pal != null)) {
- this.mBufferedPlayerActivity.offer(
- getDataAndTime() + ";"
- + aEvent.action.name()
- + ";"
- + aEvent.entityPlayer.getDisplayName()
- + ";DIM:"
- + aEvent.world.provider.dimensionId
- + ";"
- + aEvent.x
- + ";"
- + aEvent.y
- + ";"
- + aEvent.z
- + ";|;"
- + aEvent.x / 10
- + ";"
- + aEvent.y / 10
- + ";"
- + aEvent.z / 10);
- }
ItemStack aStack = aEvent.entityPlayer.getCurrentEquippedItem();
if ((aStack != null) && (aEvent.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK)
&& (aStack.getItem() == Items.flint_and_steel)) {
@@ -1603,26 +1564,6 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
public void onBlockHarvestingEvent(BlockEvent.HarvestDropsEvent aEvent) {
if (aEvent.harvester == null) return;
- if ((!aEvent.world.isRemote) && (GTLog.pal != null)) {
- this.mBufferedPlayerActivity.offer(
- getDataAndTime() + ";HARVEST_BLOCK;"
- + aEvent.harvester.getDisplayName()
- + ";DIM:"
- + aEvent.world.provider.dimensionId
- + ";"
- + aEvent.x
- + ";"
- + aEvent.y
- + ";"
- + aEvent.z
- + ";|;"
- + aEvent.x / 10
- + ";"
- + aEvent.y / 10
- + ";"
- + aEvent.z / 10);
- }
-
ItemStack aStack = aEvent.harvester.getCurrentEquippedItem();
if (aStack == null) return;
diff --git a/src/main/java/gregtech/common/config/Gregtech.java b/src/main/java/gregtech/common/config/Gregtech.java
index e852a6b022..63a1057e96 100644
--- a/src/main/java/gregtech/common/config/Gregtech.java
+++ b/src/main/java/gregtech/common/config/Gregtech.java
@@ -368,15 +368,10 @@ public class Gregtech {
@Config.RequiresMcRestart
public boolean loggingOreDict;
- @Config.Comment("if true, logs all the oredict in logs/Explosion.log.")
+ @Config.Comment("if true, logs all the explosions in logs/Explosion.log.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public boolean loggingExplosions;
-
- @Config.Comment("if true, log all the oredict in logs/PlayerActivity.log.")
- @Config.DefaultBoolean(true)
- @Config.RequiresMcRestart
- public boolean loggingPlayerActicity;
}
@Config.LangKey("GT5U.gui.config.gregtech.harvest_level")
diff --git a/src/main/java/gregtech/loaders/preload/GTPreLoad.java b/src/main/java/gregtech/loaders/preload/GTPreLoad.java
index a3d6572dd9..929660c0b7 100644
--- a/src/main/java/gregtech/loaders/preload/GTPreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GTPreLoad.java
@@ -179,18 +179,6 @@ public class GTPreLoad {
GTLog.exp = new PrintStream(GTLog.mExplosionLog);
} catch (Throwable ignored) {}
}
-
- if (Gregtech.general.loggingPlayerActicity) {
- GTLog.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log");
- if (!GTLog.mPlayerActivityLogFile.exists()) {
- try {
- GTLog.mPlayerActivityLogFile.createNewFile();
- } catch (Throwable ignored) {}
- }
- try {
- GTLog.pal = new PrintStream(GTLog.mPlayerActivityLogFile);
- } catch (Throwable ignored) {}
- }
}
public static void runMineTweakerCompat() {
generated by cgit (git 2.46.0) at 2025-03-04 18:17:27 +0000