aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-10-18 17:03:23 +0100
committerGitHub <noreply@github.com>2023-10-18 18:03:23 +0200
commitfbdbb388c369fae549cfde3eed38b536f7461d90 (patch)
treeb46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours
parentb670446fdf49991093b485f0aa14050039632775 (diff)
downloadGT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.gz
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.bz2
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.zip
Cleaning up (#767)
* Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso <colen@CONNORSPC>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java11
2 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
index a7c23c69fc..6a5bfb7838 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -11,7 +11,6 @@ import gregtech.api.items.GT_MetaBase_Item;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.items.behaviors.Behaviour_None;
import gregtech.common.items.behaviors.Behaviour_Wrench;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -48,7 +47,7 @@ public class Behaviour_Choocher extends Behaviour_None {
}
if (aPlayer.isSneaking()) {
- boolean aModeNew = Utils.invertBoolean(inWrenchMode);
+ boolean aModeNew = !inWrenchMode;
aStack.getTagCompound().setBoolean("aMode", aModeNew);
PlayerUtils.messagePlayer(aPlayer, "Mode: " + (aModeNew ? "Wrench" : "Hammer"));
return true;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index db3638a4e0..6a4bd010fb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -20,7 +20,6 @@ import gregtech.common.items.behaviors.Behaviour_None;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.entity.projectile.EntityLightningAttack;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
@@ -70,7 +69,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
Logger.INFO("Changing Mode");
boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
Logger.INFO("Is currently in Fireball mode? " + aCurrentMode);
- boolean aNewMode = Utils.invertBoolean(aCurrentMode);
+ boolean aNewMode = !aCurrentMode;
Logger.INFO("Is now set to Fireball mode? " + aNewMode);
aStack.getTagCompound().setBoolean("aFireballMod", aNewMode);
// NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode);
@@ -123,7 +122,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
Logger.INFO("Changing Mode");
boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
Logger.INFO("Is currently in Fireball mode? " + aCurrentMode);
- boolean aNewMode = Utils.invertBoolean(aCurrentMode);
+ boolean aNewMode = !aCurrentMode;
Logger.INFO("Is now set to Fireball mode? " + aNewMode);
aStack.getTagCompound().setBoolean("aFireballMode", aNewMode);
// NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode);
@@ -176,9 +175,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
Logger.WARNING("Preparing Lighter 2");
if (ChargingHelper.isItemValid(aStack)) {
Logger.WARNING("Preparing Lighter 3");
- if (aStack.getItem() instanceof IElectricItemManager) {
+ if (aStack.getItem() instanceof IElectricItemManager aItemElec) {
Logger.WARNING("Preparing Lighter 4");
- IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem();
double aCharge = aItemElec.getCharge(aStack);
long aEuCost = 4096 * 2;
if (aCharge >= aEuCost) {
@@ -203,8 +201,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
if (aStack != null) {
if (aStack.getItem() instanceof MetaGeneratedGregtechTools) {
if (ChargingHelper.isItemValid(aStack)) {
- if (aStack.getItem() instanceof IElectricItemManager) {
- IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem();
+ if (aStack.getItem() instanceof IElectricItemManager aItemElec) {
double aCharge = aItemElec.getCharge(aStack);
long aEuCost = 4096 * 2;
aUses = (int) (aCharge / aEuCost);