Skip to content

Commit

Permalink
Merge pull request #50 from Shynixn/development
Browse files Browse the repository at this point in the history
Merge changes to master --release
  • Loading branch information
Shynixn authored Oct 27, 2024
2 parents 8436ed6 + 9002961 commit e7de6ce
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 8 deletions.
13 changes: 13 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
Shynixn Plugin Distribution LICENCE

All terms and conditions of the GNU GENERAL PUBLIC LICENSE Version 3.0 below apply. The Shynixn Plugin Distribution LICENCE
further restricts what you are allowed to do. Even if certain points are allowed under the GNU GENERAL PUBLIC LICENSE Version 3.0,
the Shynixn Plugin Distribution LICENCE overrules them.

You are not allowed to redistribute the MCTennis binary files under any circumstances.
The plugin binary files are MCTennis.jar, MCTennis-Legacy.jar and MCTennis-Premium.jar.

Commercial usage of this plugin is only allowed by obtaining a licence of a particular version of the MCTennis-Legacy.jar or MCTennis-Premium.jar plugin.
e.g. being an actively paying subscribed member of the Patreon https://www.patreon.com/Shynixn at the time this particular version was available.
You do not have any rights on any potential future released versions. You need to obtain a new licence for each individual version.

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MCTennis is a spigot plugin to play Tennis games in Minecraft.

* Playable Tennis Minigame
* A moving TennisBall without any resource packs
* Version support 1.8.R3 - 1.21.R1
* Version support 1.8.R3 - 1.21.R2
* Check out the [MCTennis-Spigot-Page](https://www.spigotmc.org/resources/12056/) to get more information.

## Installation
Expand Down
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = "com.github.shynixn"
version = "1.8.0"
version = "1.9.0"

repositories {
mavenCentral()
Expand Down Expand Up @@ -38,8 +38,8 @@ dependencies {
implementation("com.google.code.gson:gson:2.8.6")

// Custom dependencies
implementation("com.github.shynixn.mcutils:common:2024.23")
implementation("com.github.shynixn.mcutils:packet:2024.33")
implementation("com.github.shynixn.mcutils:common:2024.25")
implementation("com.github.shynixn.mcutils:packet:2024.42")
implementation("com.github.shynixn.mcutils:sign:2024.3")
implementation("com.github.shynixn.mcutils:guice:2024.2")

Expand Down Expand Up @@ -99,6 +99,7 @@ tasks.register("relocatePluginJar", com.github.jengelman.gradle.plugins.shadow.t
dependsOn("shadowJar")
from(zipTree(File("./build/libs/" + (tasks.getByName("shadowJar") as Jar).archiveName)))
archiveName = "${baseName}-${version}-relocate.${extension}"
relocate("com.fasterxml", "com.github.shynixn.mctennis.lib.com.fasterxml")
relocate("com.github.shynixn.mcutils", "com.github.shynixn.mctennis.lib.com.github.shynixn.mcutils")
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/com/github/shynixn/mctennis/MCTennisPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ class MCTennisPlugin : JavaPlugin() {
Version.VERSION_1_20_R2,
Version.VERSION_1_20_R3,
Version.VERSION_1_20_R4,
Version.VERSION_1_21_R1
Version.VERSION_1_21_R1,
Version.VERSION_1_21_R2
)
} else {
listOf(Version.VERSION_1_21_R1)
listOf(Version.VERSION_1_21_R2)
}

if (!Version.serverVersion.isCompatible(*versions.toTypedArray())) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin-legacy.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MCTennis
version: 1.8.0
version: 1.9.0
author: Shynixn
website: https://www.spigotmc.org/members/shynixn.63455/
main: com.github.shynixn.mctennis.MCTennisPlugin
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MCTennis
version: 1.8.0
version: 1.9.0
author: Shynixn
website: https://www.spigotmc.org/members/shynixn.63455/
main: com.github.shynixn.mctennis.MCTennisPlugin
Expand Down

0 comments on commit e7de6ce

Please sign in to comment.