Merge pull request #5 from N3ROO/MC_1.16.3_dev

Version 1.3.0

Author: lilgallon

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.3.0
+
+- Support for the best controller mod - [Controllable](https://mrcrayfish.com/mods?id=controllable)
+
 ## Version 1.2.1
 
 - The config file is now reloaded automatically when updated

build.gradle

@@ -1,6 +1,8 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven {
+            url = 'https://files.minecraftforge.net/maven'
+        }
         jcenter()
         mavenCentral()
     }
@@ -13,15 +15,16 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.2.1-MC1.16.x'
+version = '1.3.0-MC1.16.x'
 group = 'dev.nero.aimassistance' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'aimassistance'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    mappings channel: 'snapshot', version: '20200514-1.16'
+    //mappings channel: 'snapshot', version: '20200514-1.16'
+    mappings channel: 'snapshot', version: '20200707-1.16.1'
 
     runs {
         client {
@@ -42,6 +45,13 @@ minecraft {
     }
 }
 
+repositories {
+    maven {
+        url = "https://www.cursemaven.com"
+    }
+}
+
 dependencies {
     minecraft 'net.minecraftforge:forge:1.16.3-34.1.0'
+    compile fg.deobf('curse.maven:controllable:3068902')
 }

src/main/java/dev/nero/aimassistance/AimAssistanceMod.java

@@ -7,9 +7,11 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
@@ -21,11 +23,13 @@ public class AimAssistanceMod
     // private static final Logger LOGGER = LogManager.getLogger();
 
     public static final String MOD_ID = "aimassistancemod";
+    public static final String CONTROLLABLE_MOD_ID = "controllable";
     private AimAssistance aimAssistance;
 
     public AimAssistanceMod() {
         // Register the setup method for modloading
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onCommonSetup);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup);
 
         // Register ourselves for server and other game events we are interested in
         MinecraftForge.EVENT_BUS.register(this);
@@ -34,11 +38,18 @@ public AimAssistanceMod() {
         ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Config.CLIENT_SPEC);
     }
 
-    private void setup(final FMLCommonSetupEvent event) {
+    private void onCommonSetup(final FMLCommonSetupEvent event) {
         aimAssistance = new AimAssistance();
         Config.bakeConfig(); // init config values
     }
 
+    private void onClientSetup(final FMLClientSetupEvent event) {
+        if(ModList.get().isLoaded(CONTROLLABLE_MOD_ID))
+        {
+            Wrapper.setSupportForControllable(ModList.get().isLoaded(CONTROLLABLE_MOD_ID));
+        }
+    }
+
     @SubscribeEvent
     public void onPlayerTick(TickEvent.PlayerTickEvent playerTickEvent) {
         if (Wrapper.playerPlaying()) {

src/main/java/dev/nero/aimassistance/utils/Wrapper.java

@@ -1,5 +1,6 @@
 package dev.nero.aimassistance.utils;
 
+import com.mrcrayfish.controllable.Controllable;
 import dev.nero.aimassistance.core.Target;
 import dev.nero.aimassistance.core.TargetType;
 import net.minecraft.client.Minecraft;
@@ -12,6 +13,14 @@
 public class Wrapper {
 
     public static Minecraft MC = Minecraft.getInstance();
+    private static boolean supportForControllable;
+
+    /**
+     * @param support if true, it will use the Controllable mod events
+     */
+    public static void setSupportForControllable(boolean support) {
+        supportForControllable = support;
+    }
 
     /**
      * @return true if the player is playing
@@ -24,7 +33,10 @@ public static boolean playerPlaying() {
      * @return true if the player is pressing the attack key
      */
     public static boolean attackKeyPressed() {
-        return Wrapper.MC.gameSettings.keyBindAttack.isKeyDown();
+        // could use that as well: GLFW.glfwGetMouseButton(Minecraft.getInstance().getMainWindow().getHandle(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS;
+        boolean attackPressed = Wrapper.MC.gameSettings.keyBindAttack.isKeyDown(); // vanilla
+        attackPressed |= supportForControllable && Controllable.getController() != null && Controllable.getController().getRTriggerValue() != 0.0F; // controller
+        return attackPressed;
     }
 
     /**

src/main/resources/META-INF/mods.toml

@@ -5,7 +5,7 @@ license="MIT License"
 
 [[mods]]
 modId="aimassistancemod"
-version="1.2.1"
+version="1.3.0"
 displayName="Aim Assistance"
 updateJSONURL="https://raw.githubusercontent.com/N3ROO/AimAssistanceMod/MC_1.16.3/update.json"
 displayURL="https://github.com/N3ROO/AimAssistanceMod/"

update.json

@@ -1,7 +1,9 @@
 {
   "homepage": "https://github.com/N3ROO/AimAssistanceMod/releases",
   "promos": {
-    "1.16.3-latest": "1.2.1",
-    "1.16.3-recommended": "1.2.1"
+    "1.16.3-latest": "1.3.0",
+    "1.16.3-recommended": "1.3.0",
+    "1.15.2-latest": "1.2.0",
+    "1.15.2-recommended": "1.2.0"
   }
 }