Skip to content

Commit 83b3c9d

Browse files
author
DiamondIceNS
committed
Prepare for pull request
Update README Update travis Fix issue with Forge not building correctly
1 parent 5f1122b commit 83b3c9d

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ jdk:
33
- oraclejdk8
44

55
after_success:
6-
- ./gradlew shadowJar
6+
- ./gradlew build
77

88
deploy:
99
provider: releases
1010
api_key:
1111
secure: KJd23J+YlpBuUs+5//5BjYlSQ9mVOsYnpfanE03ZQ4E9Qp+pGpMSaH60d/CXkSkDVr32QL5jk0VRDNVl0wvTZpRJfNclQgh3fh2iPkaBDmjun0YkGHfE6VeRzJZVuIF/F34pkziEC01B7Tq2loms+RSm9pNeWgN+ulaajNENUT2J4nmb33yyKbGN9I4EdjcMCQmgdnxn/4QNXV6T3Xls9S9X7AwA9pg4WNpdACqJ0oWj2YlSWKmAdcKw0iLQtRbQfbiqj6waOLODdxieIu0KVWEVQnTdcv7ElGl9BgDrHzXBjfS+9G112TBqsNIPx60o8Z7ThR02DYPWYXrRyfvaHM0FqXrBSaUZUxfHpGn5F4CRQLZh/jOnIOZ9hHmCSDD69pcS254tVCoB+hRuS7PBstuh8iUO7VGJASb5Mv34LZYLAxfvNDAKLeY60xdz/Uiku9JW0dpLQC+FWAvFZWdQ3IvCMYRnaT1fmjDJKanYvCw31l5ypACjfhIQfnwG7FKeLdh6BJx9CG/eHV2URO4do5OCLBkuL2IYQQXqlj6jU4QpXjfWDf7XCAW3MBthjwe5lnLeNZTkcwttQqIOZdCn7Qa/zaG+HJM62tnV9uhLpj4fhaGmf7tapdUWJ5cuUUGLA3MNmSqsZ3ohF5wGlKsGwFVOb6UhoB9szmA9p7zQGpw=
12-
file: build/DiscordBridge-*.jar
12+
file:
13+
- discordbridge-bukkit/build/libs/discordbridge-bukkit*.jar
14+
- discordbridge-spigot/build/libs/discordbridge-spigot*.jar
15+
- discordbridge-forge/build/libs/discordbridge-forge*.jargit
1316
file_glob: true
1417
on:
1518
repo: the-obsidian/DiscordBridge

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
# DiscordBridge [![Build Status](https://travis-ci.org/the-obsidian/DiscordBridge.svg?branch=master)](https://travis-ci.org/the-obsidian/DiscordBridge)
22

3-
Bridges chat between Discord and Minecraft (Bukkit/Spigot).
3+
Bridges chat between Discord and Minecraft.
44

55
## Requirements
66

77
* Java 8
8+
9+
Any of:
810
* Spigot 1.12
11+
* Sponge 1.12
12+
* Forge 1.12
913

1014
## Installation
1115

1216

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

1822

@@ -112,7 +116,7 @@ templates:
112116
* Anything said in Minecraft chat will be sent to your chosen Discord channel
113117
* 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
114118
* 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`)
115-
* 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`)
119+
* 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)
116120
* Uploaded images and other files in Discord will show up in Minecraft chat as clickable URLs
117121
* You can link Minecraft accounts to Discord accounts and the bot will translate display names to match where the message appears
118122
* Join / leave messages can be sent to Discord
@@ -130,6 +134,8 @@ templates:
130134
131135
## Permissions
132136
137+
***NOTE:*** Only the Spigot version supports permission nodes at this time.
138+
133139
- `discordbridge.discord` - ability to use any command in of the /discord subcommand tree
134140
- `discordbridge.discord.reload` - ability to reload configs and JDA
135141
- `discordbridge.discord.listmembers` - abiliyt to receive a list of members in the Discord channel

discordbridge-forge/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ minecraft {
2626
// Use non-default mappings at your own risk. they may not always work.
2727
// simply re-run your setup task after changing the mappings to update your workspace.
2828
mappings = "snapshot_20171003"
29-
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
29+
makeObfSourceJar = false
3030
}
3131

3232
dependencies {
@@ -53,8 +53,11 @@ processResources {
5353
}
5454

5555
shadowJar {
56-
include ':discordbridge-core'
5756
dependencies {
57+
include(project(':discordbridge-core'))
5858
}
5959
}
60-
build.dependsOn(shadowJar)
60+
61+
reobf {
62+
shadowJar { mappingType = 'SEARGE' }
63+
}

0 commit comments

Comments
 (0)