Add setting for left-right click item usage as it flags

settings.gradle.kts

@@ -6,14 +6,15 @@ pluginManagement {
         mavenCentral()
         maven("https://repo.polyfrost.org/releases") // Adds the Polyfrost maven repository to get Polyfrost Gradle Toolkit
     }
+
     plugins {
         val pgtVersion = "0.6.5" // Sets the default versions for Polyfrost Gradle Toolkit
         id("org.polyfrost.multi-version.root") version pgtVersion
     }
 }
 
 plugins {
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.+"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.+"
 }
 
 val mod_name: String by settings

src/main/java/org/polyfrost/overflowanimations/ModDetectorPlugin.java

@@ -14,8 +14,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-public class ModDetectorPlugin implements IFMLLoadingPlugin {
-
+public final class ModDetectorPlugin implements IFMLLoadingPlugin {
     public ModDetectorPlugin() {
         try {
             File modsFolder = new File(Launch.minecraftHome, "mods");
@@ -112,7 +111,6 @@ public ModDetectorPlugin() {
             }
 
         } catch (Exception ignored) {
-
         }
     }
 
@@ -133,7 +131,6 @@ public String getSetupClass() {
 
     @Override
     public void injectData(Map<String, Object> map) {
-
     }
 
     @Override

src/main/java/org/polyfrost/overflowanimations/config/ItemPositionAdvancedSettings.java

@@ -4,11 +4,9 @@
 import cc.polyfrost.oneconfig.config.annotations.Checkbox;
 import cc.polyfrost.oneconfig.config.annotations.Slider;
 import cc.polyfrost.oneconfig.config.annotations.Switch;
-import net.minecraft.client.Minecraft;
 
 @SuppressWarnings("unused")
 public class ItemPositionAdvancedSettings {
-
     // Swing Position Customization
     @Slider(
             name = "Item Swing X Position",
@@ -474,5 +472,4 @@ public class ItemPositionAdvancedSettings {
         fishingLinePositionY = 0.03f;
         fishingLinePositionZ = OldAnimationsSettings.fishingRodPosition ? 0.8f : 0.35f;
     });
-
 }

src/main/java/org/polyfrost/overflowanimations/config/OldAnimationsSettings.java

@@ -12,7 +12,6 @@
 import org.polyfrost.overflowanimations.hooks.PotionColors;
 
 public class OldAnimationsSettings extends Config {
-
     // 2D Items
     @Switch(
             name = "2D Dropped Items",
@@ -139,6 +138,13 @@ public class OldAnimationsSettings extends Config {
     )
     public static boolean punching = true;
 
+    @Checkbox(
+            name = "1.7 Left-Right Click Item Usage",
+            description = "Re-enables the ability to right click (use item) when holding left click on a block. (WARNING: Does flag anti-cheats)",
+            subcategory = "Interaction"
+    )
+    public static boolean leftRightClickItemUsage = true;
+
     @Checkbox(
             name = "1.7 Punch-During-Usage Particles",
             description = "Spawns Particles whilst Punching During Usage",
@@ -613,7 +619,7 @@ public class OldAnimationsSettings extends Config {
         advancedSettings.blockedRotationYaw = 0.0F;
         advancedSettings.blockedRotationPitch = 0.0F;
         advancedSettings.blockedRotationRoll = 0.0F;
-        advancedSettings. blockedScale = 0.0F;
+        advancedSettings.blockedScale = 0.0F;
 
         advancedSettings.droppedPositionX = 0.0F;
         advancedSettings.droppedPositionY = 0.0F;
@@ -813,7 +819,8 @@ public void transferDulkirItemPositions() {
 
     public static boolean didTheFunnyDulkirThingElectricBoogaloo = false;
 
-    @Exclude public static final OldAnimationsSettings INSTANCE = new OldAnimationsSettings();
+    @Exclude
+    public static final OldAnimationsSettings INSTANCE = new OldAnimationsSettings();
 
     public OldAnimationsSettings() {
         super(new Mod(OverflowAnimations.NAME, ModType.PVP, "/overflowanimations_dark.svg", new VigilanceMigrator("./config/sk1eroldanimations.toml")), "overflowanimations.json");
@@ -830,6 +837,7 @@ public OldAnimationsSettings() {
         addDependency("punchingParticles", "oldBlockhitting");
         addDependency("adventureParticles", "oldBlockhitting");
         addDependency("adventurePunching", "oldBlockhitting");
+        addDependency("useItemWhenMining", "oldBlockhitting");
         addDependency("adventureParticles", "punchingParticles");
         addDependency("punchingParticles", "punching");
         addDependency("adventureParticles", "punching");

src/main/java/org/polyfrost/overflowanimations/hooks/AnimationExportUtils.java

@@ -18,10 +18,12 @@
 import java.io.File;
 import java.util.Base64;
 
-public class AnimationExportUtils {
-
+public final class AnimationExportUtils {
     private static final Gson GSON = new Gson();
 
+    private AnimationExportUtils() {
+    }
+
     public static void exportItemPositions() {
         String string = Base64.getEncoder().encodeToString(GSON.toJson(new OverflowConfigData()).getBytes());
         StringSelection selection = new StringSelection(string);

src/main/java/org/polyfrost/overflowanimations/hooks/DebugCrosshairHook.java

@@ -10,14 +10,16 @@
 import org.lwjgl.opengl.GL11;
 import org.polyfrost.overflowanimations.util.MathUtils;
 
-public class DebugCrosshairHook {
+public final class DebugCrosshairHook {
+    private DebugCrosshairHook() {
+    }
 
     public static void renderDirections(float partialTicks, Minecraft mc) {
         GlStateManager.pushMatrix();
-        GlStateManager.translate((float)(UResolution.getScaledWidth() / 2), (float)(UResolution.getScaledHeight() / 2), 100);
+        GlStateManager.translate((float) (UResolution.getScaledWidth() / 2), (float) (UResolution.getScaledHeight() / 2), 100);
         Entity entity = mc.getRenderViewEntity();
-        GlStateManager.rotate(MathUtils.interp(entity.prevRotationPitch, entity.rotationPitch, partialTicks), -1.0F, 0.0F, 0.0F);
-        GlStateManager.rotate(MathUtils.interp(entity.prevRotationYaw , entity.rotationYaw, partialTicks), 0.0F, 1.0F, 0.0F);
+        GlStateManager.rotate(MathUtils.lerp(entity.prevRotationPitch, entity.rotationPitch, partialTicks), -1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(MathUtils.lerp(entity.prevRotationYaw, entity.rotationYaw, partialTicks), 0.0F, 1.0F, 0.0F);
         GlStateManager.scale(-1.0F, -1.0F, -1.0F);
         GlStateManager.disableTexture2D();
         GlStateManager.depthMask(false);
@@ -50,5 +52,4 @@ public static void renderDirections(float partialTicks, Minecraft mc) {
         GlStateManager.enableTexture2D();
         GlStateManager.popMatrix();
     }
-
 }

src/main/java/org/polyfrost/overflowanimations/hooks/DebugOverlayHook.java

@@ -1,6 +1,5 @@
 package org.polyfrost.overflowanimations.hooks;
 
-import org.polyfrost.overflowanimations.config.OldAnimationsSettings;
 import com.google.common.collect.Lists;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.chunk.RenderChunk;
@@ -11,15 +10,19 @@
 import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fml.common.FMLCommonHandler;
+import org.polyfrost.overflowanimations.config.OldAnimationsSettings;
 
 import java.util.List;
 
 /**
  * This is obviously quite an intrusive overwrite, so we put it in a hook so other mods can inject into it easier.
  */
-public class DebugOverlayHook {
+public final class DebugOverlayHook {
     private static float overflowEyeHeight;
 
+    private DebugOverlayHook() {
+    }
+
     public static List<String> getDebugInfoLeft() {
         final Minecraft mc = Minecraft.getMinecraft();
         BlockPos blockpos = new BlockPos(mc.getRenderViewEntity().posX, mc.getRenderViewEntity().getEntityBoundingBox().minY, mc.getRenderViewEntity().posZ);

src/main/java/org/polyfrost/overflowanimations/hooks/DroppedItemHook.java

@@ -2,12 +2,13 @@
 
 import org.polyfrost.overflowanimations.OverflowAnimations;
 
-public class DroppedItemHook {
+public final class DroppedItemHook {
+    private DroppedItemHook() {
+    }
 
     public static boolean isItemDropped;
 
-    public static boolean isItemPhysicsAndEntityDropped() {
-        return OverflowAnimations.isItemPhysics && isItemDropped;
+    public static boolean isItemPhysicsAndEntityNotDropped() {
+        return !OverflowAnimations.isItemPhysics || !isItemDropped;
     }
-
 }

src/main/java/org/polyfrost/overflowanimations/hooks/HitColorHook.java

@@ -8,7 +8,9 @@
 import org.polyfrost.overflowanimations.OverflowAnimations;
 import org.polyfrost.overflowanimations.mixin.interfaces.RendererLivingEntityInvoker;
 
-public class HitColorHook {
+public final class HitColorHook {
+    private HitColorHook() {
+    }
 
     public static void renderHitColorPre(EntityLivingBase entitylivingbaseIn, boolean bl, float partialTicks, RendererLivingEntity<?> instance) {
         float brightness = entitylivingbaseIn.getBrightness(partialTicks);
@@ -39,7 +41,7 @@ public static void renderHitColorPost(boolean bl) {
             GlStateManager.enableAlpha();
             GlStateManager.enableTexture2D();
         }
+
         Minecraft.getMinecraft().entityRenderer.enableLightmap();
     }
-
 }

src/main/java/org/polyfrost/overflowanimations/hooks/OverflowConfigData.java

@@ -4,90 +4,89 @@
 import org.polyfrost.overflowanimations.config.OldAnimationsSettings;
 
 public class OverflowConfigData {
+    public float itemPositionX;
 
-    public float itemPositionX = 0.0F;
+    public float itemPositionY;
 
-    public float itemPositionY = 0.0F;
+    public float itemPositionZ;
 
-    public float itemPositionZ = 0.0F;
+    public float itemRotationYaw;
 
-    public float itemRotationYaw = 0.0F;
+    public float itemRotationPitch;
 
-    public float itemRotationPitch = 0.0F;
+    public float itemRotationRoll;
 
-    public float itemRotationRoll = 0.0F;
-
-    public float itemScale = 0.0F;
+    public float itemScale;
 
     // Swing Position Customization
-    public float itemSwingPositionX = 0.0F;
+    public float itemSwingPositionX;
 
-    public float itemSwingPositionY = 0.0F;
+    public float itemSwingPositionY;
 
-    public float itemSwingPositionZ = 0.0F;
+    public float itemSwingPositionZ;
 
-    public float itemSwingSpeed = 0.0F;
+    public float itemSwingSpeed;
 
-    public float itemSwingSpeedHaste = 0.0F;
+    public float itemSwingSpeedHaste;
 
-    public float itemSwingSpeedFatigue = 0.0F;
+    public float itemSwingSpeedFatigue;
 
     public boolean shouldScaleSwing = false;
 
     // Eating/Drinking Position
-    public float consumePositionX = 0.0F;
+    public float consumePositionX;
 
-    public float consumePositionY = 0.0F;
+    public float consumePositionY;
 
-    public float consumePositionZ = 0.0F;
+    public float consumePositionZ;
 
-    public float consumeRotationYaw = 0.0F;
+    public float consumeRotationYaw;
 
-    public float consumeRotationPitch = 0.0F;
+    public float consumeRotationPitch;
 
-    public float consumeRotationRoll = 0.0F;
+    public float consumeRotationRoll;
 
-    public float consumeScale = 0.0F;
+    public float consumeScale;
 
-    public float consumeIntensity = 0.0F;
+    public float consumeIntensity;
 
-    public float consumeSpeed = 0.0F;
+    public float consumeSpeed;
 
     public boolean shouldScaleEat = false;
 
     // Sword Block Position
-    public float blockedPositionX = 0.0F;
+    public float blockedPositionX;
 
-    public float blockedPositionY = 0.0F;
+    public float blockedPositionY;
 
-    public float blockedPositionZ = 0.0F;
+    public float blockedPositionZ;
 
-    public float blockedRotationYaw = 0.0F;
+    public float blockedRotationYaw;
 
-    public float blockedRotationPitch = 0.0F;
+    public float blockedRotationPitch;
 
-    public float blockedRotationRoll = 0.0F;
+    public float blockedRotationRoll;
 
-    public float blockedScale = 0.0F;
+    public float blockedScale;
 
     // Projectiles Position
-    public float projectilePositionX = 0.0F;
+    public float projectilePositionX;
 
-    public float projectilePositionY = 0.0F;
+    public float projectilePositionY;
 
-    public float projectilePositionZ = 0.0F;
+    public float projectilePositionZ;
 
-    public float projectileRotationYaw = 0.0F;
+    public float projectileRotationYaw;
 
-    public float projectileRotationPitch = 0.0F;
+    public float projectileRotationPitch;
 
-    public float projectileRotationRoll = 0.0F;
+    public float projectileRotationRoll;
 
-    public float projectileScale = 0.0F;
+    public float projectileScale;
 
     public OverflowConfigData() {
-        OldAnimationsSettings settings = OldAnimationsSettings.INSTANCE;
-        ItemPositionAdvancedSettings advanced = OldAnimationsSettings.advancedSettings;
+        final OldAnimationsSettings settings = OldAnimationsSettings.INSTANCE;
+        final ItemPositionAdvancedSettings advanced = OldAnimationsSettings.advancedSettings;
         itemPositionX = settings.itemPositionX;
         itemPositionY = settings.itemPositionY;
         itemPositionZ = settings.itemPositionZ;

src/main/java/org/polyfrost/overflowanimations/hooks/PatcherConfigHook.java

@@ -3,7 +3,10 @@
 import club.sk1er.patcher.config.PatcherConfig;
 import org.polyfrost.overflowanimations.OverflowAnimations;
 
-public class PatcherConfigHook {
+public final class PatcherConfigHook {
+    private PatcherConfigHook() {
+    }
+
     public static boolean isParallaxFixEnabled() {
         return OverflowAnimations.isPatcherPresent && PatcherConfig.parallaxFix;
     }

src/main/java/org/polyfrost/overflowanimations/hooks/PotionColors.java

@@ -3,8 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class PotionColors {
-
+public final class PotionColors {
     public static final Map<Integer, Integer> POTION_COLORS;
 
     public static boolean shouldReload;
@@ -13,6 +12,9 @@ public static void reloadColor() {
         shouldReload = true;
     }
 
+    private PotionColors() {
+    }
+
     static {
         POTION_COLORS = new HashMap<Integer, Integer>() {{
             put(1, 3402751);
@@ -40,5 +42,4 @@ public static void reloadColor() {
             put(23, 16262179);
         }};
     }
-
 }