Skip to content

Commit

Permalink
Prepare for pull request
Browse files Browse the repository at this point in the history
Update README
Update travis
Fix issue with Forge not building correctly
  • Loading branch information
DiamondIceNS committed Feb 7, 2018
1 parent 5f1122b commit 83b3c9d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ jdk:
- oraclejdk8

after_success:
- ./gradlew shadowJar
- ./gradlew build

deploy:
provider: releases
api_key:
secure: KJd23J+YlpBuUs+5//5BjYlSQ9mVOsYnpfanE03ZQ4E9Qp+pGpMSaH60d/CXkSkDVr32QL5jk0VRDNVl0wvTZpRJfNclQgh3fh2iPkaBDmjun0YkGHfE6VeRzJZVuIF/F34pkziEC01B7Tq2loms+RSm9pNeWgN+ulaajNENUT2J4nmb33yyKbGN9I4EdjcMCQmgdnxn/4QNXV6T3Xls9S9X7AwA9pg4WNpdACqJ0oWj2YlSWKmAdcKw0iLQtRbQfbiqj6waOLODdxieIu0KVWEVQnTdcv7ElGl9BgDrHzXBjfS+9G112TBqsNIPx60o8Z7ThR02DYPWYXrRyfvaHM0FqXrBSaUZUxfHpGn5F4CRQLZh/jOnIOZ9hHmCSDD69pcS254tVCoB+hRuS7PBstuh8iUO7VGJASb5Mv34LZYLAxfvNDAKLeY60xdz/Uiku9JW0dpLQC+FWAvFZWdQ3IvCMYRnaT1fmjDJKanYvCw31l5ypACjfhIQfnwG7FKeLdh6BJx9CG/eHV2URO4do5OCLBkuL2IYQQXqlj6jU4QpXjfWDf7XCAW3MBthjwe5lnLeNZTkcwttQqIOZdCn7Qa/zaG+HJM62tnV9uhLpj4fhaGmf7tapdUWJ5cuUUGLA3MNmSqsZ3ohF5wGlKsGwFVOb6UhoB9szmA9p7zQGpw=
file: build/DiscordBridge-*.jar
file:
- discordbridge-bukkit/build/libs/discordbridge-bukkit*.jar
- discordbridge-spigot/build/libs/discordbridge-spigot*.jar
- discordbridge-forge/build/libs/discordbridge-forge*.jargit
file_glob: true
on:
repo: the-obsidian/DiscordBridge
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
# DiscordBridge [![Build Status](https://travis-ci.org/the-obsidian/DiscordBridge.svg?branch=master)](https://travis-ci.org/the-obsidian/DiscordBridge)

Bridges chat between Discord and Minecraft (Bukkit/Spigot).
Bridges chat between Discord and Minecraft.

## Requirements

* Java 8

Any of:
* Spigot 1.12
* Sponge 1.12
* Forge 1.12

## Installation


1. Download the latest release from GitHub
2. Add it to your plugins folder
3. Either run Bukkit/Spigot once to generate DiscordBridge/config.yml or create it using the guide below.
2. Add it to your plugin/mod folder
3. Either run your server once to generate DiscordBridge/config.yml or create it using the guide below.
4. All done!


Expand Down Expand Up @@ -112,7 +116,7 @@ templates:
* Anything said in Minecraft chat will be sent to your chosen Discord channel
* If Multiverse-Core is installed and the `%w` tag is specified in your relay message syntax, the alias assigned to your Multiverse worlds will be displayed
* Anything said in your chosen Discord channel will be sent to your Minecraft chat (if the `%w` tag is used in your relay message syntax, Discord messages will display `Discord`)
* If Dynmap is installed, anything said over Dynmap chat will be relayed to your chosen Discord channel (if the `%w` tag is used in your relay messag syntax, Dynmap messages will display `Dynmap`)
* If Dynmap is installed, anything said over Dynmap chat will be relayed to your chosen Discord channel (if the `%w` tag is used in your relay messag syntax, Dynmap messages will display `Dynmap`) (Spigot only for now)
* Uploaded images and other files in Discord will show up in Minecraft chat as clickable URLs
* You can link Minecraft accounts to Discord accounts and the bot will translate display names to match where the message appears
* Join / leave messages can be sent to Discord
Expand All @@ -130,6 +134,8 @@ templates:
## Permissions
***NOTE:*** Only the Spigot version supports permission nodes at this time.
- `discordbridge.discord` - ability to use any command in of the /discord subcommand tree
- `discordbridge.discord.reload` - ability to reload configs and JDA
- `discordbridge.discord.listmembers` - abiliyt to receive a list of members in the Discord channel
Expand Down
9 changes: 6 additions & 3 deletions discordbridge-forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ minecraft {
// Use non-default mappings at your own risk. they may not always work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20171003"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
makeObfSourceJar = false
}

dependencies {
Expand All @@ -53,8 +53,11 @@ processResources {
}

shadowJar {
include ':discordbridge-core'
dependencies {
include(project(':discordbridge-core'))
}
}
build.dependsOn(shadowJar)

reobf {
shadowJar { mappingType = 'SEARGE' }
}

0 comments on commit 83b3c9d

Please sign in to comment.