Skip to content
This repository has been archived by the owner on Aug 20, 2022. It is now read-only.

multiple shit, read comment #33

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This is a basic workflow to help you get started with Actions
# easy steal
name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout repository
uses: actions/checkout@master
- name: Checkout submodules
uses: textbook/git-checkout-submodule-action@master
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Make gradlew executable
run: chmod +x ./gradlew
- name: Build
run: ./gradlew build --warning-mode=all
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest"
prerelease: true
title: "Latest Build"
files: |
./build/libs/*.jar
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ keystrokes/
logs/
saves/
mc/
script.sh
24 changes: 18 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,28 @@
// For those who want the bleeding edge
buildscript {
repositories {
jcenter()
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
url = "https://maven.minecraftforge.net/"
}
maven {
name = "jitpack"
url = "https://jitpack.io/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
classpath "com.github.asbyth:ForgeGradle:6f53277"
}
repositories {
mavenLocal()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:6.0.0"
}
}

apply plugin: 'java'
Expand Down Expand Up @@ -40,7 +52,7 @@ group= "club.sk1er.keystrokes"
archivesBaseName = "[1.8.9] BetterKeystrokes V"

minecraft {
version = "1.8.9-11.15.1.1722"
version = "1.8.9-11.15.1.2318-1.8.9"
runDir = "run"

mappings = "stable_20"
Expand Down Expand Up @@ -80,4 +92,4 @@ processResources {
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
}
Binary file not shown.
Binary file removed build/libs/[1.8.9] BetterKeystrokes V-1.1.0.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
16 changes: 12 additions & 4 deletions src/main/java/keystrokesmod/module/modules/combat/AutoClicker.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class AutoClicker extends Module {
public static ModuleSettingTick leftClick;
public static ModuleSettingTick rightClick;
public static ModuleSettingTick inventoryFill;
public static ModuleSettingTick allowEat, allowBow;
public static ModuleSettingTick allowEat, allowBow, noPotion;
public static ModuleSettingSlider rightClickDelay;
public static ModuleSettingSlider clickEvent, clickTimings;
public static ModuleSettingDoubleSlider leftCPS, rightCPS, breakBlocksDelay;
Expand Down Expand Up @@ -82,9 +82,10 @@ public AutoClicker() {
this.registerSetting(jitterRight = new ModuleSettingSlider("Jitter right", 0.0D, 0.0D, 3.0D, 0.1D));
this.registerSetting(rightClickDelay = new ModuleSettingSlider("Rightclick delay (ms)", 85D, 0D, 500D, 1.0D));
this.registerSetting(noBlockSword = new ModuleSettingTick("Don't rightclick sword", true));
this.registerSetting(onlyBlocks = new ModuleSettingTick("Only rightclick with blocks", false));
this.registerSetting(onlyBlocks = new ModuleSettingTick("Only rightclick with blocks and throwables", false));
this.registerSetting(preferFastPlace = new ModuleSettingTick("Prefer fast place", false));
this.registerSetting(allowEat = new ModuleSettingTick("Allow eat", true));
this.registerSetting(noPotion = new ModuleSettingTick("Allow drink", true));
this.registerSetting(allowBow = new ModuleSettingTick("Allow bow", true));


Expand Down Expand Up @@ -364,13 +365,20 @@ public boolean rightClickAllowed() {
}
}
if (onlyBlocks.isToggled()) {
if (!(item.getItem() instanceof ItemBlock))
if ((item.getItem() instanceof ItemBlock) || (item.getItem() instanceof ItemEgg) || (item.getItem() instanceof ItemSnowball) || (item.getItem() instanceof ItemExpBottle)) {
return true;
} else {
return false;
}
}
if (noBlockSword.isToggled()) {
if (item.getItem() instanceof ItemSword)
return false;
}
if (noPotion.isToggled()) {
if ((item.getItem() instanceof ItemPotion) || (item.getItem() instanceof ItemBucketMilk))
return false;
}
}

if(preferFastPlace.isToggled()) {
Expand Down Expand Up @@ -606,4 +614,4 @@ public boolean breakBlock() {
}
return false;
}
}
}
Binary file modified src/main/resources/assets/keystrokes/raven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.