From 8b93a2909d7285f6506a56889929039c41882845 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Tue, 9 Jun 2020 17:55:25 +0200 Subject: MachineBlock runnable toggle Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- .../api/threads/GT_Runnable_MachineBlockUpdate.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/threads') diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java index 3d28a94de9..284b37ad09 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -36,8 +36,27 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { this.z = aZ; } + public static boolean isEnabled() { + return isEnabled; + } + + public static void setEnabled() { + GT_Runnable_MachineBlockUpdate.isEnabled = true; + } + + public static void setDisabled() { + GT_Runnable_MachineBlockUpdate.isEnabled = false; + } + + public static void setEnabled(boolean isEnabled) { + GT_Runnable_MachineBlockUpdate.isEnabled = isEnabled; + } + + private static boolean isEnabled = false; + public static void setMachineUpdateValues(World aWorld, int aX, int aY, int aZ) { - EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ)); + if (isEnabled) + EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ)); } public static void initExecutorService() { -- cgit From c40ad6aecab563410ad68fde6e39bcc0e3121469 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Thu, 11 Jun 2020 21:09:51 +0200 Subject: Revert "MachineBlock runnable toggle" This reverts commit 8b93a2909d7285f6506a56889929039c41882845. --- build.properties | 2 +- .../api/threads/GT_Runnable_MachineBlockUpdate.java | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'src/main/java/gregtech/api/threads') diff --git a/build.properties b/build.properties index eb5559e8fc..3d0a5a60b2 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.33.52 +gt.version=5.09.33.51 ae2.version=rv3-beta-22 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java index 284b37ad09..3d28a94de9 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -36,27 +36,8 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { this.z = aZ; } - public static boolean isEnabled() { - return isEnabled; - } - - public static void setEnabled() { - GT_Runnable_MachineBlockUpdate.isEnabled = true; - } - - public static void setDisabled() { - GT_Runnable_MachineBlockUpdate.isEnabled = false; - } - - public static void setEnabled(boolean isEnabled) { - GT_Runnable_MachineBlockUpdate.isEnabled = isEnabled; - } - - private static boolean isEnabled = false; - public static void setMachineUpdateValues(World aWorld, int aX, int aY, int aZ) { - if (isEnabled) - EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ)); + EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ)); } public static void initExecutorService() { -- cgit From 780d5dca0ef4614ba724aa275b23e9db28490a3f Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 12 Jun 2020 10:53:15 +0200 Subject: Revert "Revert "MachineBlock runnable toggle"" This reverts commit c40ad6aecab563410ad68fde6e39bcc0e3121469. --- .../api/threads/GT_Runnable_MachineBlockUpdate.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/threads') diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java index 3d28a94de9..284b37ad09 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -36,8 +36,27 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { this.z = aZ; } + public static boolean isEnabled() { + return isEnabled; + } + + public static void setEnabled() { + GT_Runnable_MachineBlockUpdate.isEnabled = true; + } + + public static void setDisabled() { + GT_Runnable_MachineBlockUpdate.isEnabled = false; + } + + public static void setEnabled(boolean isEnabled) { + GT_Runnable_MachineBlockUpdate.isEnabled = isEnabled; + } + + private static boolean isEnabled = false; + public static void setMachineUpdateValues(World aWorld, int aX, int aY, int aZ) { - EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ)); + if (isEnabled) + EXECUTOR_SERVICE.submit(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ)); } public static void initExecutorService() { -- cgit From 9bea4eeb1b59740ba417902ed595c7b4ebb62c34 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 12 Jun 2020 10:54:15 +0200 Subject: fix --- .../java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/api/threads') diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java index 284b37ad09..129c6a7a57 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -45,14 +45,14 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { } public static void setDisabled() { - GT_Runnable_MachineBlockUpdate.isEnabled = false; + GT_Runnable_MachineBlockUpdate.isEnabled = true; } public static void setEnabled(boolean isEnabled) { GT_Runnable_MachineBlockUpdate.isEnabled = isEnabled; } - private static boolean isEnabled = false; + private static boolean isEnabled = true; public static void setMachineUpdateValues(World aWorld, int aX, int aY, int aZ) { if (isEnabled) -- cgit From d0a8a3d73f7ddfaf3c6bfde7d6ceca7dc91f0b93 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 12 Jun 2020 19:46:33 +0200 Subject: fix derp --- src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/threads') diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java index 129c6a7a57..ee56a0b0c0 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -45,7 +45,7 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { } public static void setDisabled() { - GT_Runnable_MachineBlockUpdate.isEnabled = true; + GT_Runnable_MachineBlockUpdate.isEnabled = false; } public static void setEnabled(boolean isEnabled) { -- cgit