aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/handler/events
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-01-20 02:07:40 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-01-20 02:07:40 +1000
commita6bb1b33da251f4a2ec7a6d6facb4864e9905341 (patch)
tree84d47440794cadd5c64598355903b123e18e0662 /src/Java/gtPlusPlus/core/handler/events
parent142fe00070526484862f15f3a125400a22a2fe96 (diff)
downloadGT5-Unofficial-a6bb1b33da251f4a2ec7a6d6facb4864e9905341.tar.gz
GT5-Unofficial-a6bb1b33da251f4a2ec7a6d6facb4864e9905341.tar.bz2
GT5-Unofficial-a6bb1b33da251f4a2ec7a6d6facb4864e9905341.zip
+ Added a power cost of 32eu/action for the Tree Farmer. (Will eventually get a config option).
% Moved the internal power buffer variable out of the cut method into the class. % Massive project tidy up, lots of old unused code removed or tidied up. $ Fixed lots of String comparisons that used == instead of .equals(). $ Fixed Double/Triple/Quad null checks in certain places. $ Fixed returns that set values at the same time. $ Swapped 3.14 and 1.57 to Math.PI and Math.PI/2. $ Fixed possible cases where a NPE may be thrown, by calling logging outside of null checks. + Added PI to CORE.java, since it's a double and MC uses it as a float in each instance. - Stripped 95% of the useless code out of Meta_GT_Proxy.java
Diffstat (limited to 'src/Java/gtPlusPlus/core/handler/events')
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java2
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/SneakManager.java67
2 files changed, 35 insertions, 34 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index f9abae6d32..a50524122b 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -28,7 +28,7 @@ public class LoginEventHandler {
try {
- if (localPlayerRef instanceof EntityPlayerMP && localPlayerRef != null){
+ if (localPlayerRef instanceof EntityPlayerMP){
//Populates player cache
if (!localPlayerRef.worldObj.isRemote){
diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
index 9edc962a6b..f330fea861 100644
--- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
+++ b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
@@ -4,7 +4,7 @@ import gtPlusPlus.core.util.Utils;
import net.minecraft.client.Minecraft;
public class SneakManager {
-
+
//We make this a singleton for clientside data storage.
public static SneakManager instance = new SneakManager();
protected static final Minecraft mc = Minecraft.getMinecraft();
@@ -12,72 +12,73 @@ public class SneakManager {
public static boolean isSneaking = true;
public static boolean optionDoubleTap = true;
public static boolean wasSprintDisabled = false;
-
+
private static State Sprinting = State.ON;
private static State Crouching = State.OFF;
-
+
public static boolean Sneaking(){
return Crouching.getState();
}
-
+
public static boolean Sprinting(){
return Sprinting.getState();
}
-
+
public static State getSneakingState(){
return Crouching;
}
-
+
public static State getSprintingDisabledState(){
return Sprinting;
}
-
+
public static void toggleSneaking(){
toggleState(Crouching);
}
-
+
public static void toggleSprinting(){
toggleState(Sprinting);
}
-
+
private static State toggleState(State state){
Utils.LOG_INFO("State Toggle");
- if (state == State.ON)
- return state = State.OFF;
- return state = State.ON;
+ if (state == State.ON) {
+ return State.OFF;
+ }
+ return State.ON;
}
-
+
public static State setCrouchingStateON(){
return Crouching = State.ON;
}
-
+
public static State setCrouchingStateOFF(){
return Crouching = State.OFF;
}
-
+
public static State setSprintingStateON(){
return Sprinting = State.ON;
}
-
+
public static State setSprintingStateOFF(){
return Sprinting = State.OFF;
}
-
- public static enum State {
- ON(true),
- OFF(false);
-
- private boolean STATE;
- private State (final boolean State)
- {
- this.STATE = State;
- }
-
- public boolean getState() {
- return STATE;
- }
-
- }
-
+
+ public static enum State {
+ ON(true),
+ OFF(false);
+
+ private boolean STATE;
+ private State (final boolean State)
+ {
+ this.STATE = State;
+ }
+
+ public boolean getState() {
+ return STATE;
+ }
+
+ }
+
}