Skip to content

Commit 57ed46b

Browse files
SkulliansSkullians
committed
Started migration from dependency on InteractiveChat
1 parent 98cd490 commit 57ed46b

File tree

308 files changed

+9037
-20124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+9037
-20124
lines changed

‎.github/FUNDING.yml

-4
This file was deleted.

‎.github/dependabot.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: "maven"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"
8+
groups:
9+
maven-plugin:
10+
patterns:
11+
- "org.apache.maven.plugins:*"
12+
ignore:
13+
# Gson is bundled with Minecraft. Keep in sync.
14+
- dependency-name: "com.google.code.gson:gson"
15+
open-pull-requests-limit: 10
16+
17+
- package-ecosystem: "github-actions"
18+
directory: "/"
19+
schedule:
20+
interval: "weekly"
21+
groups:
22+
github-actions:
23+
update-types:
24+
- "major"
25+
patterns:
26+
- "*"

‎.github/workflows/build.yml

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: CI - Build
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- dependabot/**
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
name: Build with Maven
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Cache local Maven repository
19+
id: cache-maven
20+
uses: actions/cache@v4
21+
with:
22+
path: ~/.m2/repository
23+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24+
restore-keys: |
25+
${{ runner.os }}-maven-
26+
27+
- name: Download Spigot Buildtools
28+
if: steps.cache-maven.outputs.cache-hit != 'true'
29+
run: |
30+
mkdir ~/spigot-buildtools
31+
cd ~/spigot-buildtools
32+
wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
33+
34+
- name: Setup JDK 21
35+
uses: actions/setup-java@v4
36+
with:
37+
java-version: 21
38+
distribution: temurin
39+
40+
- name: Install CraftBukkit 1.20
41+
if: steps.cache-maven.outputs.cache-hit != 'true'
42+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.20-R0.1-SNAPSHOT/craftbukkit-1.20-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.20 --remapped --compile CRAFTBUKKIT; fi
43+
44+
- name: Install CraftBukkit 1.20.2
45+
if: steps.cache-maven.outputs.cache-hit != 'true'
46+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.20.2-R0.1-SNAPSHOT/craftbukkit-1.20.2-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.20.2 --remapped --compile CRAFTBUKKIT; fi
47+
48+
- name: Install CraftBukkit 1.20.4
49+
if: steps.cache-maven.outputs.cache-hit != 'true'
50+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.20.4-R0.1-SNAPSHOT/craftbukkit-1.20.4-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.20.4 --remapped --compile CRAFTBUKKIT; fi
51+
52+
- name: Install CraftBukkit 1.20.3
53+
if: steps.cache-maven.outputs.cache-hit != 'true'
54+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.20.3-R0.1-SNAPSHOT/craftbukkit-1.20.3-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.20.3 --remapped --compile CRAFTBUKKIT; fi
55+
56+
- name: Install CraftBukkit 1.20.6
57+
if: steps.cache-maven.outputs.cache-hit != 'true'
58+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.20.6-R0.1-SNAPSHOT/craftbukkit-1.20.6-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.20.6 --remapped --compile CRAFTBUKKIT; fi
59+
60+
- name: Install CraftBukkit 1.21
61+
if: steps.cache-maven.outputs.cache-hit != 'true'
62+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.21-R0.1-SNAPSHOT/craftbukkit-1.21-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.21 --remapped --compile CRAFTBUKKIT; fi
63+
64+
- name: Install CraftBukkit 1.21.1
65+
if: steps.cache-maven.outputs.cache-hit != 'true'
66+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.21.1-R0.1-SNAPSHOT/craftbukkit-1.21.1-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.21.1 --remapped --compile CRAFTBUKKIT; fi
67+
68+
- name: Install CraftBukkit 1.21.3
69+
if: steps.cache-maven.outputs.cache-hit != 'true'
70+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.21.3-R0.1-SNAPSHOT/craftbukkit-1.21.3-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.21.3 --remapped --compile CRAFTBUKKIT; fi
71+
72+
- name: Install CraftBukkit 1.21.4
73+
if: steps.cache-maven.outputs.cache-hit != 'true'
74+
run: if [ ! -f "~/.m2/repository/org/bukkit/craftbukkit/1.21.4-R0.1-SNAPSHOT/craftbukkit-1.21.4-R0.1-SNAPSHOT-remapped-mojang.jar" ]; then cd ~/spigot-buildtools && java -jar BuildTools.jar --rev 1.21.4 --remapped --compile CRAFTBUKKIT; fi
75+
76+
- name: Set up Maven Wrapper
77+
run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper "-Dmaven=3.9.9"
78+
79+
- name: Build with Maven
80+
run: |
81+
./mvnw clean package --batch-mode --no-transfer-progress --show-version
82+
echo "version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
83+
84+
- name: Upload Artifacts
85+
uses: actions/upload-artifact@v4
86+
with:
87+
name: MultiChatDiscordSrvAddon-${{ env.version }}+${{ github.run_number }}
88+
path: |
89+
dist/target/MultiChatDiscordSrvAddon-*.jar

‎README.md

+25-31
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,44 @@
11
[![Build Status](https://ci.loohpjames.com/job/InteractiveChat-DiscordSRV-Addon/badge/icon)](https://ci.loohpjames.com/job/InteractiveChat-DiscordSRV-Addon/)
2-
# InteractiveChat DiscordSRV Addon
2+
# MultiChat DiscordSRV Addon
33

4-
https://www.spigotmc.org/resources/83917/
4+
This is a fork of [InteractiveChat-DiscordSRV-Addon](https://github.com/LOOHP/InteractiveChat-DiscordSRV-Addon)!\
5+
Have InteractiveChat, ZelChat and ChatControl Placeholders translated on DiscordSRV discord messages. As well as sharing items, inventories to discord and sharing images and gifs to the game from discord!
56

6-
Have InteractiveChat Placeholders translated on DiscordSRV discord messages. As well as sharing items, inventories to discord and sharing images and gifs to the game from discord!
7+
## Changes by this Fork
8+
This fork aims to bring the functionality of the original InteractiveChat addon to other plugins which have similar functionalities.\
9+
This fork mostly removes the complete dependency on InteractiveChat - A lot of InteractiveChat classes are carried over to still maintain compatibility.\
10+
All code credits go towards LOOHP, who has given permission for this fork to be created and maintained by me.
711

8-
More information (screenshots, commands, permissions) about the plugin can be found on the Spigot page linked above.
12+
> [!WARNING]
13+
> If you encounter bugs while using this fork, **do not report this to the original author!\
14+
> You should create an issue for [this fork](https://github.com/TerraByteDev/MultiChat-DIscordSRV-Addon/issues).
915
1016
## Built against Spigot
1117
Built against [Spigot's API](https://www.spigotmc.org/wiki/buildtools/) (required mc versions are listed on the spigot page above).
1218
Plugins built against Spigot usually also work with [Paper](https://papermc.io/).
1319

1420
## Development Builds
1521

16-
- [Jenkins](https://ci.loohpjames.com/job/InteractiveChat-DiscordSRV-Addon/)
17-
18-
## Maven
19-
```html
20-
<repository>
21-
<id>loohp-repo</id>
22-
<url>https://repo.loohpjames.com/repository</url>
23-
</repository>
24-
```
25-
```html
26-
<dependency>
27-
<groupId>com.loohp</groupId>
28-
<artifactId>InteractiveChatDiscordSrvAddon</artifactId>
29-
<version>VERSION</version>
30-
<scope>provided</scope>
31-
</dependency>
32-
```
33-
Replace `VERSION` with the version number.
22+
- TODO
3423

3524
## Dependencies
3625

37-
- [InteractiveChat](https://www.spigotmc.org/resources/75870/)
26+
### Required
3827
- [DiscordSRV](https://www.spigotmc.org/resources/discordsrv.18494/)
3928

40-
## Partnerships
41-
42-
### Server Hosting
43-
**Use the link or click the banner** below to **get a 25% discount off** your first month when buying any of their gaming servers!<br>
44-
It also **supports my development**, take it as an alternative way to donate while getting your very own Minecraft server as well!
29+
### Optional (1 required)
30+
- [InteractiveChat](https://www.spigotmc.org/resources/75870/)
31+
- [ZelChat](https://builtbybit.com/resources/zelchat-high-performance-simple.47406/)
32+
- [ChatControl](https://builtbybit.com/resources/chatcontrol-format-filter-chat.18217/)
4533

46-
*P.S. Using the link or clicking the banner rather than the code supports me more! (Costs you no extra!)*
34+
## Compiling Yourself
35+
### Prerequisites
36+
- [Maven](https://maven.apache.org/) - This must be installed in order to compile the plugin.
4737

48-
**https://www.bisecthosting.com/loohp**
38+
You must compile CraftBukkit versions 1.20 to 1.21.4 via [BuildTools](https://www.spigotmc.org/wiki/buildtools/).\
39+
Ensure the compiled versions are saved to your .m2 repository - Go to Options > Generate Remapped Jars (tick it).\
40+
Ensure that, under Compilation Options, CraftBukkit is set to true. (Options)
4941

50-
![https://www.bisecthosting.com/loohp](https://www.bisecthosting.com/partners/custom-banners/fc7f7b10-8d1a-4478-a23a-8a357538a180.png)
42+
### Compiling
43+
Run `mvn clean package` in a terminal in the same folder as the addon.\
44+
The plugin will be available in the `target` directory.

‎V1_10/pom.xml

-134
This file was deleted.

0 commit comments

Comments
 (0)