Skip to content

Commit

Permalink
update (#2)
Browse files Browse the repository at this point in the history
* ModuleManager lookup fixes.

* ModuleManager lookup fixes.

* updateLookup() should store in lowercase

* Fix kami-blue#296 (kami-blue#297)

* ModuleManager safety

* Module wasn't spelled correctly, causing NPE.

* update readme instructions

* add logs to gitignore

* update contributing readme

* formatting in readme

* fix deprecated file in readme

* typo in readme

* add troubleshooting to readme

* close kami-blue#360

* change name for kami-blue#358

* formatting in readme

* rearrange readme

* update elytraflight to work on highways

* capitalize s in Speed

* add antichunkload patch

* update armourhide to be able to hide pieces

* enable antichunkloadpatch automatically

* elytraflight highway mode set to fly

* fix bug (you were not saving new chunks anymore after closing the file once) (kami-blue#361)

* fix for kami-blue#361

* True Durability and Friends List (kami-blue#338) to close kami-blue#337 and close kami-blue#240 and close and close kami-blue#327

* True Durability

* Friends List

* Separated extratab and tabfriends

* move truedurability to thing

* enable tabfriends automatically

* disable antichunkloadpatch by default

* hide tabfriends by default

* add antichatspam for kami-blue#12

* noswing

* Add proper credits to noswing as per zeroeightysix/162

* visualrange (kami-blue#364)

Co-authored-by: blockparole <[email protected]>

* nobreakanimation (kami-blue#365)

Co-authored-by: blockparole <[email protected]>

* fix packages for new 3

* autospawner (kami-blue#366)

Co-authored-by: blockparole <[email protected]>

* refactor for kami-blue#336

* change defaults and stuff

* add pull32k (kami-blue#367)

Co-authored-by: fluffycq <[email protected]>

* blacklist add enchanting table

* Update as per zeroeightysix/KAMi

zeroeightysix/KAMI@d0f11b3

* Feature/rpcusers (kami-blue#369)

* update rpc to use different images

* fuck around until it works idk

* add debugging code

* make everything work now!

* fix image names and descriptions

* add case 3 and 4

* fix typo

* make holeesp settings better thanks to clinet

* make code pretty and use case statements thanks to darkis feedback

* reorder settings

* add defaults button to elytraflight

* Fix typo in readme

* make holeesp case code pretty

* move autoqmain to proper package

* close kami-blue#318

* close kami-blue#318 and close kami-blue#306

* Clean up infooverlay section

* collapse small methods

* add labels for sections

* focussed > focused

* comment testing code

* Feature/aliases to close kami-blue#358 (kami-blue#376)

* Add Aliases

* Add aliases cmd and cmds to CommandsCommand

* undo build.gradle changes

* shorten check in commandmanager

* add more aliases

Co-authored-by: d1gress <[email protected]>
Co-authored-by: Qther <[email protected]>

* reorganize and clean up kamigui

* Revert "reorganize and clean up kamigui"

This reverts commit 246ead9.

* close kami-blue#382

* add aliases to tp cmd

* close kami-blue#383

* clean up code and close kami-blue#253

* add credits to Surround

* temp make friends list not load if minimised

* switch to hub's autotrap

* fix naming as per zeroeightysix/KAMI/pull/164

* fixcomment style zeroeightysix/KAMI/pull/153 zeroeightysix/KAMI/pull/163

* Update scaffold

// TODO: clean up code

* Set up CI with Azure Pipelines

* Set up CI with Azure Pipelines 2

[skip ci]

* Set up CI with Azure Pipelines

[skip ci]

* Set up CI with Azure Pipelines

[skip ci]

* wack

* Update .travis.yml

* Delete KznnorExploit

* remove this mixin for now as it's broken

* prepare code for kami-blue#33 and kami-blue#42

* close kami-blue#42

* code cleanup and optimization

* combine calculator classes into one

* delete gui scale

* rearrange reamde

* add option to dsiable info msg in aura

* close kami-blue#396

* fix typos

* make method more efficient in kamigui

* close kami-blue#312

* fix comment style

* autoenable invpreview

* bump ver to v1.1.2

* Revert "Update .travis.yml"

This reverts commit e0b02b7.

* hopefully this works

* i hate everything

* close kami-blue#402

* optimize imports

* autodisable default

* Create incompatiblity-report.md

* sane naming for infooverlay

* close kami-blue#385

* refactor infooverlay and make code cleaner

* refactor command sign and color > colour

* create ColourCodesMinecraft

* close kami-blue#391

* dates oops

* close kami-blue#403

* Delete PearlDupe.java

* fix launch crash

* Rearrange readme and make it easier to understand

* yes

* idk

* clean up build script

* revert qther's changes

* close kami-blue#292

* fix repo refs

* fix travis

* close kami-blue#411

* fix repo refs

* close kami-blue#384 and kami-blue#336

* close kami-blue#410

* close kami-blue#400

* comments and missed things

* add downloads badges

* move discord badge first

* add proper links for new badges

* wrong link for 086, last commit i swear aksdlka

* Update README.md

* close kami-blue#417

* unused import :bigbrain:

* dates

* close kami-blue#33

* update kami-blue#33

* add rounder to infocalc

* add timerspeed uwu ty tbm

* ignore always null

* add animation to surround

* move timerspeed to movement

* update comment for inventory size

* dates

* fix credit message

* change class access for info stuff

* Speed default

* update shields

* move everything over to blue.bella.wtf

* change discord presence url to new website

* typo here as well

Co-authored-by: Sasha <[email protected]>
Co-authored-by: Bella Who <[email protected]>
Co-authored-by: TBM <[email protected]>
Co-authored-by: blockparole <[email protected]>
Co-authored-by: fluffycq <[email protected]>
Co-authored-by: d1gress <[email protected]>
Co-authored-by: Qther <[email protected]>
Co-authored-by: Ridan Vandenbergh <[email protected]>
  • Loading branch information
9 people authored Feb 2, 2020
1 parent 16d4724 commit 3aef35e
Show file tree
Hide file tree
Showing 234 changed files with 3,241 additions and 3,316 deletions.
8 changes: 0 additions & 8 deletions .github/CONTRIBUTING/CONTRIBUTING_GUIDELINES.md

This file was deleted.

15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/incompatiblity-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Incompatibility Report
about: Incompatible with another mod
labels: incompatible

---

**What mod?**
A clear and concise description of what mod it is.

**Logs**
Please add logs or your issue will be closed.

**Additional context**
Add any other context about the problem here.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ flycheck_*.el
### ForgeGradle ###
# Minecraft client/server files
run/
logs/

### Intellij+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ deploy:
provider: releases
api_key:
secure: MIGJAoGBALeFvpaS4szqW9jo3uH3kaS2YJZSyghvokomKuiPIBr8mnO6BNm6C5sJDKX7ihhJdKUA/MpEFCiObj5ZPiXcV7gHlyVN2FCP5ucFLHtasa3j6nCH5lvdLxAwAbPKq8PPCq8rurmFWBLuuCWXR0VW2OG1+Oo4b9U1d5ywST7hpvOrAgMBAAE=
file: build/libs/*-release.jar
file: build/libs/*-release.jar
file_glob: true
skip_cleanup: true
on:
repo: S-B99/KAMI
repo: S-B99/kamiblue
tags: true
233 changes: 15 additions & 218 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,233 +1,30 @@
<img src="https://github.com/S-B99/KAMI/blob/assets/assets/icons/kami.svg" align="left" width="120"/>
<img src="https://github.com/S-B99/kamiblue/blob/assets/assets/icons/kami.svg" align="left" width="120"/>

# KAMI Blue

### A minecraft utility mod for anarchy servers.

| | S-B99 (features-master)| 086 (upstream) |
|:------------:|:-------------:|:--------------:|
| Build Status | [![Build Status features-master](https://img.shields.io/travis/com/S-B99/KAMI/feature/master?logo=gradle&label=build)](https://travis-ci.com/S-B99/KAMI/) | [![Build Status 086](https://travis-ci.com/zeroeightysix/KAMI.svg?logo=gradle&branch=master)](https://travis-ci.com/zeroeightysix/KAMI) |
| Media | [![Discord Mine](https://img.shields.io/discord/573954110454366214?label=chat&logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) | [![Discord 086](https://img.shields.io/discord/496724196542513174)](http://discord.gg/9hvwgeg) |
| Version | [![Version master](https://img.shields.io/github/v/release/S-B99/kami?color=dark-green&label=latest&logo=java)](https://github.com/S-B99/KAMI/releases) | [![Version 086](https://img.shields.io/github/v/tag/zeroeightysix/KAMI?color=red&label=outdated)](https://github.com/zeroeightysix/KAMI/releases) |

<!--| Issues | [![Issues Mine](https://img.shields.io/github/issues/S-B99/KAMI?label=issues&logo=github)](https://github.com/S-B99/kami/issues) | [![Issues 086](https://img.shields.io/github/issues/zeroeightysix/KAMI?color=red&label=issues)](https://github.com/zeroeightysix/kami/issues) |-->
<!--| Build Status | [![Build Status features-master](https://img.shields.io/travis/com/S-B99/KAMI/features-master?label=build)](https://travis-ci.com/S-B99/KAMI/tree/features-master) | [![Build Status master](https://img.shields.io/travis/com/S-B99/KAMI/master?label=build)](https://travis-ci.com/S-B99/KAMI/tree/master) | [![Build Status 086](https://travis-ci.com/zeroeightysix/KAMI.svg?branch=master)](https://travis-ci.com/zeroeightysix/KAMI) |-->
<!--| Issues | [![Issues Mine](https://img.shields.io/github/issues/S-B99/KAMI?label=issues)](https://github.com/S-B99/kami/issues) | [![Issues Mine](https://img.shields.io/github/issues/S-B99/KAMI?label=issues)](https://github.com/S-B99/kami/issues) | [![Issues 086](https://img.shields.io/github/issues/zeroeightysix/KAMI?color=red&label=issues)](https://github.com/zeroeightysix/kami/issues) |-->
<!--| Media | [![Discord Mine](https://img.shields.io/discord/573954110454366214?label=chat&logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) | [![Discord Mine](https://img.shields.io/discord/573954110454366214?label=chat&logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) | [![Discord 086](https://img.shields.io/badge/chat-on%20discord-brightgreen.svg)](http://discord.gg/9hvwgeg) |-->
<!--| Version | [![Version features-master](https://img.shields.io/github/v/tag/S-B99/KAMI?color=orange&include_prereleases&label=unstable&sort=semver)](https://github.com/S-B99/KAMI/releases) | [![Version master](https://img.shields.io/github/v/release/S-B99/kami?color=dark-green&label=latest)](https://github.com/S-B99/KAMI/releases) | [![Version 086](https://img.shields.io/github/v/tag/zeroeightysix/KAMI?color=red&label=outdated)](https://github.com/zeroeightysix/KAMI/releases) |-->
#
<a href="https://github.com/S-B99/kamiblue/releases/download/v1.1.2/KAMI-Blue-v1.1.2-release.jar">
<img src="https://github.com/S-B99/kamiblue/blob/assets/assets/icons/download.svg" width="200"/>
</a>

Please consider donating to help continue this project and get a unique cape in game.
| | S-B99 (feature/master)| 086 (upstream) |
|:------------:|:-------------:|:--------------:|
| Build Status | [![Build Status features-master](https://img.shields.io/travis/com/S-B99/kamiblue/feature/master?logo=gradle&label=build)](https://travis-ci.com/S-B99/kamiblue/) | [![Build Status 086](https://img.shields.io/travis/com/zeroeightysix/KAMI/master?logo=gradle)](https://travis-ci.com/zeroeightysix/KAMI) |
| Media | [![Discord Mine](https://img.shields.io/discord/573954110454366214?label=chat&logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) | [![Discord 086](https://img.shields.io/discord/496724196542513174?label=discord&logo=discord&logoColor=white)](http://discord.gg/9hvwgeg) |
| Downloads | [![Dl discord](https://img.shields.io/badge/discord-22k-brightgreen?logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) [![Dl Github](https://img.shields.io/github/downloads/S-B99/kamiblue/total?label=github&logo=github)](https://github.com/S-B99/kamiblue/releases) | [![Dl github 086](https://img.shields.io/github/downloads/zeroeightysix/KAMI/total?label=github&logo=github)](https://github.com/zeroeightysix/KAMI/releases) |
| Version | [![Version master](https://img.shields.io/github/v/release/S-B99/kamiblue?color=dark-green&label=latest&logo=java)](https://github.com/S-B99/kamiblue/releases) | [![Version 086](https://img.shields.io/github/v/tag/zeroeightysix/kami?color=bright-green&label=latest%20%28pre%20v1.0.0%29&logo=java)](https://github.com/zeroeightysix/KAMI/releases) |

[![Paypal](https://img.shields.io/badge/paypal-donate-red?color=169bd7&logo=paypal)](https://paypal.me/bellawhotwo)
[![BTC](https://img.shields.io/badge/btc-clickme-red?color=f08b16&logo=bitcoin)](https://www.blockchain.com/btc/address/19pH4aNZZMPJkqQ2826BauRokyBs1NYon7)
[![BCH](https://img.shields.io/badge/bch-clickme-red?color=2db300&logo=cash-app)](https://www.blockchain.com/bch/address/19pH4aNZZMPJkqQ2826BauRokyBs1NYon7)

<details>
<summary>Click to view disclaimers</summary>

***

This will be frequently updated as long as I'm not on vacation or anything

This is by no means a finished project, nor is it a "cheat" or "hack" for anything, it is a *utility* mod.

Please note Baritone is no longer included. Download the standalone jar [from here](https://github.com/cabaletta/baritone/releases) The latest 1.12.2 jar is [this](https://github.com/cabaletta/baritone/releases/tag/v1.2.10).

See [forgehax](https://github.com/fr1kin/forgehax) for an equivalent. Some features in KAMI may be based on those of forgehax, and KAMI / KAMI Blue have some features it doesn't. KAMI Blue won't be based off of other mods unless said otherwise.

***

</details>

## How to download

Press the releases button or [click here](https://github.com/S-B99/KAMI/releases)

## Status

<details>
<summary>Click to view current development status</summary>

***

Please see the [issues](https://github.com/S-B99/KAMI/issues/12) page for planned features and bugs to fix.

This is currently in active development. When issues are being closed is by milestone, and bugs are higher priority, though there aren't any that break anything completely.
***

</details>

## Preview

<details>
<summary>Click to view images</summary>

***

Click on images to expand

***

Capes in game

<img src="https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/readme/capes.png" width="500"/>

Rich presence on discord

<img src="https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/readme/rpc.png" width="500"/>

Shulker preview being used in chat

<img src="https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/readme/shulkerChat.png" width="500"/>

CrystalAura targeting

<img src="https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/readme/crystalAura.png" width="500"/>

***

</details>

## Installing

To install drag the `VERSION-release.jar` to your `mods/1.12.2` folder

<details>
<summary>Click to see more detailed installing instructions</summary>

KAMI Blue is a forge mod. Start by downloading the latest version of [1.12.2 forge](https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.12.2.html).
1. Install forge
2. Go to your `.minecraft` directory.
* **Linux**: `~/.minecraft`
* **Windows**: `%appdata%/.minecraft`
* **OS X**: `~/Library/Application Support/minecraft`
3. Navigate to the `mods` directory. If it doesn't exist, create it.
4. Get the KAMI Blue `.jar` file.
* By **downloading** it: see [releases](../../releases)
* By **building** it: see [building](#building).
5. Drag the `-release.jar` file into your mods directory.

</details>

## How do I

<details>
<summary>Click to see the frequently asked questions or basic stuff</summary>

***

##### Open the GUI
Press Y.

##### Use commands
The default prefix is `.`. Commands are used through chat, use `.commands` for a list of commands.

##### Bind modules
Run `.bind <module> <key>`.

You can also use `.bind modifiers on` to allow modules to be bound to keybinds with modifiers, e.g `ctrl + shift + w` or `ctrl + c`.

##### Change command prefix
By using the command `prefix <prefix>` or after having ran KAMI Blue (make sure it's closed), editing your configuration file (find it using `config path` in-game) and changing the value of `commandPrefix` to change the prefix.

***

</details>

## Building

<details>
<summary>Click to see building instructions</summary>

***

#### Linux
You can build by running these commands (without the <>) in a terminal.
```
git clone https://github.com/S-B99/KAMI/
cd KAMI
chmod +x gradlew
./gradlew <args>
```
Possible arguments:
```
build
mkdir
rmOld
copy
```
If you use more than one then it must be in that order.

Build is required, `mkdir` makes the `mods/1.12.2` directory, `rmOld` removes old versions of KAMI and KAMI Blue\* in that directory, and `copy` copies the build release to the `mods/1.12.2` directory.

\*`rmOld` removes any jars ending in `-release.jar`, which is the format KAMI used and that KAMI Blue uses. If you use any other mod that uses that naming scheme please remove old versions manually.

If you prefer copying it manually, find a file in `build/libs` called `KAMI-<kamiVersion>-**release**.jar` which you can copy to the `mods/1.12.2` folder of a minecraft instance that has forge installed.

Note: This assumes your minecraft folder is in the default location under your home folder.

Note: Any argument other then `build` assumes you downloaded KAMI Blue to a nested folder inside your home folder. For example `~/Downloads/KAMI` or `~/Documents/KAMI`. This will be fixed as per [issue #15](https://github.com/S-B99/KAMI/issues/15)

***

#### Windows
You can build by running these commands in a terminal with the current directory being KAMI. (EG. `cd C:\Users\Username\Downloads\KAMI`)
```
gradlew.bat build
```

To copy on windows run `autocopy.bat`

If you prefer copying it manually, find a file in `build/libs` called `KAMI-<kamiVersion>-**release**.jar` which you can copy to the `mods\1.12.2` folder of a minecraft instance that has forge installed.

Note: This assumes your minecraft folder is in the default location under your %appdata% folder.

***

If you get build errors see this: [troubleshooting page](docs/TROUBLESHOOTING.md)

***

</details>

## Contributing

<details>
<summary>Click to see how to contribute</summary>

***

You are free to clone, modify KAMI and KAMI Blue and make pull requests as you wish. To set up your development environment, make use of the following commands:

On GNU/Linux, run `chmod +x gradlew` and for the following commands use `./gradlew` instead of `gradlew.bat`

Of-course you can also use a Gradle installation if you for some reason want another version of gradle
```
git clone https://github.com/S-B99/KAMI/
cd KAMI
```
Import KAMI Blue into your IDE of choice.
```
gradlew.bat setupDecompWorkspace
gradlew.bat genIntellijRuns #for intellij
gradlew.bat eclipse #for eclipse
```
If you use IntelliJ, import `build.gradle`

If you use Eclipse, import a new gradle project and select the KAMI folder.

If you have gradle related issues with either of these force your gradle version to `4.8.1`

If you do not wish to run from an IDE, use `gradlew.bat runClient` to run KAMI Blue.

***

If you get build errors see this: [troubleshooting page](docs/TROUBLESHOOTING.md)
Please consider donating to help continue this project and get a unique cape in game.

***
## Help and documentation

</details>
Please go to [https://blue.bella.wtf](https://blue.bella.wtf) for documentation and help.

## Thank you

Expand All @@ -239,4 +36,4 @@ If you get build errors see this: [troubleshooting page](docs/TROUBLESHOOTING.md

The [Minecraft Forge team](https://github.com/MinecraftForge) for [forge](https://files.minecraftforge.net/)

All the [contributors](https://github.com/S-B99/KAMI/graphs/contributors), including the ones who will be remembered in comments and in our hearts. This has been a huge community effort and I couldn't have done it without them.
All the [contributors](https://github.com/S-B99/kamiblue/graphs/contributors), including the ones who will be remembered in comments and in our hearts. This has been a huge community effort and I couldn't have done it without them.
11 changes: 3 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,7 @@ dependencies {
compile(group: 'org.reflections', name: 'reflections', version: '0.9.11') {
exclude group: 'com.google.guava', module: 'guava'
}
// https://mvnrepository.com/artifact/club.minnced/discord-rpc-release
// discord rpc
//compile group: 'club.minnced', name: 'discord-rpc-release', version: 'v3.3.0'
// compile 'club.minnced:java-discord-rpc:2.0.2'
//compile 'club.minnced:java-discord-rpc:%VERSION%'

compile 'club.minnced:java-discord-rpc:v2.0.1'
}

processResources {
Expand Down Expand Up @@ -135,13 +130,13 @@ shadowJar {
dependencies {
include(dependency('org.spongepowered:mixin'))
include(dependency('com.github.ZeroMemes:Alpine'))
include(dependency('club.minnced:java-discord-rpc'))
include(dependency('net.jodah:typetools'))
include(dependency('org.yaml:snakeyaml'))
include(dependency('org.reflections:reflections'))
include(dependency('org.javassist:javassist'))
}
exclude 'dummyThing'
exclude 'LICENSE.txt'
exclude 'dummyThing' // can someone explain why this is here
classifier = 'release'
}

Expand Down
18 changes: 4 additions & 14 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,33 @@
START_TIME="$(date +%s)"
echo "BUILD: started at $(date -d "@$START_TIME")"

echo "BUILD: cd back"
cd ../

echo "BUILD: copied"
mkdir KAMI-Blue-beta/
cp -r kamiblue/gradle* KAMI-Blue-beta/
cp -r kamiblue/gradlew* KAMI-Blue-beta/
cp -r kamiblue/gradle/ KAMI-Blue-beta/
cp -r kamiblue/build.sh KAMI-Blue-beta/
cp -r kamiblue/build.gradle KAMI-Blue-beta/
cp -r kamiblue/src/ KAMI-Blue-beta/
echo "BUILD: copied"

echo "BUILD: cd in"
cd KAMI-Blue-beta/ || exit

echo "BUILD: removing keygen"
rm -rf src/main/java/me/zeroeightsix/kami/module/modules/sdashb/experimental/Gen.java

echo "BUILD: cleaning"
./gradlew clean

#echo "BUILD: setup workspace"
#./gradlew setupDecompWorkspace

echo "BUILD: build command"
echo "BUILD: building"
./gradlew build rmOld copy

echo "BUILD: cd back"
cd ../

echo "BUILD: deleting"
rm -rf KAMI-Blue-beta/
echo "BUILD: deleted"

echo "BUILD: cd in"
cd kamiblue/ || exit

echo "BUILD: finished"
echo "BUILD: SUCCESFUL"

END_TIME="$(date +%s)"
echo "BUILD: took" $(($(date +%s)-$START_TIME)) "seconds"
Expand Down
Loading

0 comments on commit 3aef35e

Please sign in to comment.