Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev commits before code-base update #3

Merged
merged 3 commits into from
Jan 24, 2025
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
artifacts: |
build/libs/GeyserVoice-*.jar
env:
GITHUB_REPOSITORY: mineserv-top/GeyserVoice
GITHUB_REPOSITORY: AvionBlock/GeyserVoice

- name: Create pre-release
if: github.event.inputs.status != 'stable'
Expand All @@ -77,4 +77,4 @@ jobs:
artifacts: |
build/libs/GeyserVoice-*.jar
env:
GITHUB_REPOSITORY: mineserv-top/GeyserVoice
GITHUB_REPOSITORY: AvionBlock/GeyserVoice
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

GeyserVoice is a Java plugin designed to enhance the multiplayer gaming experience on Minecraft servers by integrating the [VoiceCraft](https://github.com/SineVector241/VoiceCraft-MCBE_Proximity_Chat/) Proximity Chat application. The plugin facilitates cross-platform communication, allowing players on both Java and Bedrock editions to seamlessly engage in proximity-based voice conversations.


### Features

- Cross-Platform Communication:
Expand All @@ -12,17 +11,21 @@ GeyserVoice is a Java plugin designed to enhance the multiplayer gaming experien
Experience a more immersive and realistic gameplay environment with proximity-based voice chat. Engage in conversations with nearby players, enhancing teamwork and coordination.

### How It Works

Installation: Simply install the GeyserVoice plugin on your Minecraft Java server. Make sure to follow the setup instructions to integrate it seamlessly with the VoiceCraft Proximity Chat application.

### Getting Started
For detailed instructions on installing and configuring GeyserVoice, please refer to the [Wiki](https://github.com/mineserv-top/GeyserVoice/wiki/) section of this repository.

For detailed instructions on installing and configuring GeyserVoice, please refer to the [Wiki](https://github.com/AvionBlock/GeyserVoice/wiki/) section of this repository.

### Contributing
We welcome contributions from the community to improve and expand the functionality of GeyserVoice. If you have ideas, bug reports, or would like to contribute code, please check out our [Contribution](https://github.com/mineserv-top/GeyserVoice/wiki/Contribution) Guidelines.

We welcome contributions from the community to improve and expand the functionality of GeyserVoice. If you have ideas, bug reports, or would like to contribute code, please check out our [Contribution](https://github.com/AvionBlock/GeyserVoice/wiki/Contribution) Guidelines.

### License

GeyserVoice is licensed under the MIT License. Feel free to use, modify, and distribute the plugin in accordance with the terms of the license.

### Proxy server support
GeyserVoice also supports usage with Velocity and Bungeecord networks. Just install the .jar on your proxy server and on your paper server(s). Be sure to edit the config of the paper server(s) to set `server-behind-proxy` to `true` and then reload using `voice reload`. P.s. You don't need to set the server address, port and keys on the paper server(s), this is only needed on the proxy server.

GeyserVoice also supports usage with Velocity and Bungeecord networks. Just install the .jar on your proxy server and on your paper server(s). Be sure to edit the config of the paper server(s) to set `server-behind-proxy` to `true` and then reload using `voice reload`. P.s. You don't need to set the server address, port and keys on the paper server(s), this is only needed on the proxy server.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ public class Constants {
public final static String VERSION = "{{ version}}";
public final static String DESCRIPTION = "{{ description }}";
public final static String URL = "{{ url }}";
}
}
3 changes: 2 additions & 1 deletion src/main/java/io/greitan/avion/bungeecord/GeyserVoice.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import io.greitan.avion.bungeecord.commands.VoiceCommand;
import io.greitan.avion.bungeecord.listeners.*;
import io.greitan.avion.common.BaseGeyserVoice;
import io.greitan.avion.common.network.Network;
import io.greitan.avion.common.network.Payloads.PlayerData;
import io.greitan.avion.bungeecord.tasks.PositionsTask;
Expand All @@ -28,7 +29,7 @@
import java.util.Map;
import java.util.HashMap;

public class GeyserVoice extends Plugin { // implements BaseGeyserVoice {
public class GeyserVoice extends Plugin implements BaseGeyserVoice {
private static @Getter Configuration config;

private static @Getter GeyserVoice instance;
Expand Down
8 changes: 2 additions & 6 deletions src/main/legacy/velocity-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
"id": "geyservoice",
"name": "${project.artifactId}",
"version": "${project.version}",
"description": "Plugin created to send titles, actionbars and bossbars to the player and the proxy using the MiniMessage format.",
"authors": ["4drian3d"],
"dependencies": [
{ "id": "protocolize", "optional": true },
{ "id": "protocolizelegacysupport", "optional": true }
],
"description": "",
"authors": ["Alpha"],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can add my name, "Miniontoby", there as well now, tho...

"main": "io.greitan.avion.velocity.GeyserVoice"
}
10 changes: 5 additions & 5 deletions src/main/resource-templates/bungee.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: { { name } }
name: {{ name }}

version: { { version } }
version: {{ version }}

main: io.greitan.avion.bungeecord.GeyserVoice
description: { { description } }
description: {{ description }}

author: Alpha
website: { { url } }
website: {{ url }}

prefix: { { name } }
prefix: {{ name }}

commands:
voice:
Expand Down
10 changes: 5 additions & 5 deletions src/main/resource-templates/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: { { name } }
name: {{ name }}

version: { { version } }
version: {{ version }}

main: io.greitan.avion.paper.GeyserVoice
description: { { description } }
description: {{ description }}

author: Alpha
website: { { url } }
website: {{ url }}

api-version: "1.20"
prefix: { { name } }
prefix: {{ name }}

soft-depend:
- PlaceholderAPI
Expand Down
Loading