Skip to content

Disabled anchor respawn points interactions. #172

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

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
ef8b50b
- Updated all entities, potion effects and enchantments to work with …
Jun 18, 2024
a1a6209
- [New] 1.21 update!
Jun 19, 2024
55e8100
EliteMobs 9.0.0-SNAPSHOT-2
Jun 20, 2024
696bfc8
EliteMobs 9.0.0-SNAPSHOT-3
Jun 22, 2024
aec2b52
EliteMobs 9.0.1
Jun 27, 2024
8d25c8e
EliteMobs 9.0.2
Jul 2, 2024
f9fdea3
EliteMobs 9.0.3
Jul 7, 2024
c2a103c
EliteMobs 9.0.4
Jul 17, 2024
d8d3843
EliteMobs 9.0.5
Jul 25, 2024
d0c6e77
Update DiscordCommand.java
frostcone Jul 25, 2024
31f6421
Update DiscordMessageCommand.java
frostcone Jul 25, 2024
4742611
Command updates
frostcone Jul 25, 2024
8f46511
Merge pull request #161 from frostcone/EliteMobs-9
MagmaGuy Jul 25, 2024
6d513f6
EliteMobs 9.0.5
Jul 26, 2024
3b8131e
Finished going through commands
frostcone Jul 26, 2024
7da1b0a
Updated plugin.yml with the rest of permissions
frostcone Jul 26, 2024
5c10ef4
Updated SetupDoneCommand.java fixed help text for SetupDoneCommand
frostcone Jul 26, 2024
d3f4bfa
Updated MoneyCheckPlayerCommand.java fixed setusage for MoneyCheckPlayer
frostcone Jul 26, 2024
31e24a9
Some minor edits to commands
frostcone Jul 26, 2024
3ace2b0
Merge pull request #162 from frostcone/EliteMobs-9
MagmaGuy Jul 26, 2024
66e312b
EliteMobs 9.1.0 SNAPSHOT:
Jul 29, 2024
1c5bf30
EliteMobs 9.1.0:
Aug 2, 2024
1a2cc05
EliteMobs 9.1.1:
Aug 4, 2024
de9c9a9
EliteMobs 9.1.2:
Aug 4, 2024
fe709eb
EliteMobs 9.1.3:
Aug 8, 2024
0b7308c
EliteMobs 9.1.3:
Aug 11, 2024
a5d3df5
- Updated all entities, potion effects and enchantments to work with …
Jun 18, 2024
ec5836e
- [New] 1.21 update!
Jun 19, 2024
3bc61f9
EliteMobs 9.0.0-SNAPSHOT-2
Jun 20, 2024
43f1594
EliteMobs 9.0.0-SNAPSHOT-3
Jun 22, 2024
b62cfe3
EliteMobs 9.0.1
Jun 27, 2024
eedf942
EliteMobs 9.0.2
Jul 2, 2024
09e70af
EliteMobs 9.0.3
Jul 7, 2024
22d7dab
EliteMobs 9.0.4
Jul 17, 2024
a74477d
EliteMobs 9.0.5
Jul 25, 2024
0341a88
Update DiscordCommand.java
frostcone Jul 25, 2024
f246b67
Update DiscordMessageCommand.java
frostcone Jul 25, 2024
afd1756
Command updates
frostcone Jul 25, 2024
1d6471c
EliteMobs 9.0.5
Jul 26, 2024
ce03dda
Finished going through commands
frostcone Jul 26, 2024
2c7e8db
Updated plugin.yml with the rest of permissions
frostcone Jul 26, 2024
be7e6ef
Updated SetupDoneCommand.java fixed help text for SetupDoneCommand
frostcone Jul 26, 2024
dff5c0a
Updated MoneyCheckPlayerCommand.java fixed setusage for MoneyCheckPlayer
frostcone Jul 26, 2024
66de9c0
Some minor edits to commands
frostcone Jul 26, 2024
78a7669
EliteMobs 9.1.0 SNAPSHOT:
Jul 29, 2024
9be41c3
EliteMobs 9.1.0:
Aug 2, 2024
719d98d
EliteMobs 9.1.1:
Aug 4, 2024
943eb50
EliteMobs 9.1.2:
Aug 4, 2024
5e46588
EliteMobs 9.1.3:
Aug 8, 2024
73a5689
EliteMobs 9.1.3:
Aug 11, 2024
3ba854b
Merge remote-tracking branch 'origin/EliteMobs-9' into EliteMobs-9
Aug 11, 2024
837b443
- Updated all entities, potion effects and enchantments to work with …
Jun 18, 2024
b1ac623
- [New] 1.21 update!
Jun 19, 2024
4eec955
EliteMobs 9.0.0-SNAPSHOT-2
Jun 20, 2024
f4e041f
EliteMobs 9.0.0-SNAPSHOT-3
Jun 22, 2024
cb54de4
EliteMobs 9.0.1
Jun 27, 2024
cbd7431
EliteMobs 9.0.2
Jul 2, 2024
cd02705
EliteMobs 9.0.3
Jul 7, 2024
b0c1a50
EliteMobs 9.0.4
Jul 17, 2024
714336d
EliteMobs 9.0.5
Jul 25, 2024
317fc89
Update DiscordCommand.java
frostcone Jul 25, 2024
3b86278
Update DiscordMessageCommand.java
frostcone Jul 25, 2024
1f0d214
Command updates
frostcone Jul 25, 2024
f347e4e
EliteMobs 9.0.5
Jul 26, 2024
34df33f
Finished going through commands
frostcone Jul 26, 2024
ef19f3c
Updated plugin.yml with the rest of permissions
frostcone Jul 26, 2024
5e5ad31
Updated SetupDoneCommand.java fixed help text for SetupDoneCommand
frostcone Jul 26, 2024
425ec9c
Updated MoneyCheckPlayerCommand.java fixed setusage for MoneyCheckPlayer
frostcone Jul 26, 2024
e97db49
Some minor edits to commands
frostcone Jul 26, 2024
11689bc
EliteMobs 9.1.0 SNAPSHOT:
Jul 29, 2024
f2027dc
EliteMobs 9.1.0:
Aug 2, 2024
2a89b9e
EliteMobs 9.1.1:
Aug 4, 2024
1582827
EliteMobs 9.1.2:
Aug 4, 2024
2673a2d
EliteMobs 9.1.3:
Aug 8, 2024
fd05cee
EliteMobs 9.1.3:
Aug 11, 2024
8843707
Merge remote-tracking branch 'origin/EliteMobs-9' into EliteMobs-9
Aug 11, 2024
3e69cdc
EliteMobs 9.1.4:
Aug 22, 2024
d2d0418
EliteMobs 9.1.5:
Aug 23, 2024
29065ba
EliteMobs 9.1.6:
Aug 24, 2024
ae0cb9d
EliteMobs 9.1.7:
Aug 25, 2024
f1f0e0d
EliteMobs 9.1.8:
Aug 27, 2024
4674e37
Disabled anchor respawn points interactions.
CptZee Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Maven repository:
Maven:
```
<repository>
<id>elitemobs-repo/id>
<id>elitemobs-repo</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository>

<dependency>
<groupId>com.magmaguy</groupId>
<artifactId>EliteMobs</artifactId>
<version>8.7.4-SNAPSHOT</version>
<version>9.0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
Expand All @@ -43,7 +43,7 @@ repositories {

dependencies{
//EliteMobs
compileOnly group: 'com.magmaguy', name: 'EliteMobs', version: '8.7.4-SNAPSHOT'
compileOnly group: 'com.magmaguy', name: 'EliteMobs', version: '9.0.2-SNAPSHOT'
}

```
Expand Down
115 changes: 33 additions & 82 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import org.apache.tools.ant.filters.ReplaceTokens

plugins {
id 'java-library'
id 'idea'
id 'maven-publish'
id "com.github.johnrengelman.shadow" version "7.0.0"
id("io.github.goooler.shadow") version "8.1.8"
id 'signing'
}

//Fixes issues related to special characters being used
compileJava.options.encoding = "UTF-8"
compileTestJava.options.encoding = "UTF-8"

//Fixes issues with utf-8 in the translations files. Why? Don't know.
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

//Fixes issues with utf-8 in the translations files.
processResources {
def props = [version: version]
inputs.properties props
Expand All @@ -23,7 +27,7 @@ processResources {
}

group 'com.magmaguy'
version '8.7.16-SNAPSHOT'
version '9.1.8'

repositories {
maven {
Expand All @@ -42,13 +46,16 @@ repositories {
mavenLocal()

//Spigot API & CloudCommands
maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' }
//maven { url = 'https://oss.sonatype.org/content/repositories/central' }

maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots" }

//FreeMinecraftModels
maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
//MagmaCore
maven {
url = 'https://repo.magmaguy.com/releases'
}
//MagmaCore
maven {
url = 'https://repo.magmaguy.com/snapshots'
}

//Bstats API
maven { url = 'https://repo.codemc.org/repository/maven-public' }
Expand All @@ -61,38 +68,22 @@ repositories {
maven { url = 'https://repo.md-5.net/content/groups/public/' }
//PlaceholderAPI
maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }

//WorldGuard API
maven { url = 'https://maven.enginehub.org/repo/' }

//Model Engine
maven {
url = 'https://mvn.lumine.io/repository/maven-public/'
metadataSources {
artifact()
}
}

}

dependencies {
//Spigot API
compileOnly "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT"
// The full CraftBukkit server with no shadowing. Requires mavenLocal.
//BStats API
implementation group: 'org.bstats', name: 'bstats-bukkit', version: '2.2.1'
compileOnly "org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT"
//WorldGuard API
compileOnly group: 'com.sk89q.worldguard', name: 'worldguard-bukkit', version: '7.0.7'
//WorldEdit API
compileOnly group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.2.12'
//CloudCommands
implementation group: 'cloud.commandframework', name: 'cloud-paper', version: '1.7.1'
//CloudCommands Minecraft Extras module
implementation group: 'cloud.commandframework', name: 'cloud-minecraft-extras', version: '1.7.0'
//CloudCommands Adventure Platform module
implementation('net.kyori:adventure-platform-bukkit:4.1.1')
//I can't remember what this was for but it's in CloudCommands
implementation group: 'io.leangen.geantyref', name: 'geantyref', version: '1.3.4'
//Vault
compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
exclude group: 'org.bukkit', module: 'bukkit'
Expand All @@ -102,34 +93,29 @@ dependencies {
//SQLite
compileOnly group: 'org.xerial', name: 'sqlite-jdbc', version: '3.32.3'
//MySQL
implementation 'mysql:mysql-connector-java:8.0.33'
compileOnly 'mysql:mysql-connector-java:8.0.33'
//LibsDisguises
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '4.7.0'
compileOnly group: 'LibsDisguises', name: 'LibsDisguises', version: '10.0.26'
//PlaceholderAPI
compileOnly group: 'me.clip', name: 'placeholderapi', version: '2.10.9'

implementation group: 'commons-io', name: 'commons-io', version: '2.7'
implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'

//reflections - used for config initialization
implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'

//lombok
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'

compileOnly 'org.projectlombok:lombok:1.18.34'
annotationProcessor 'org.projectlombok:lombok:1.18.34'
//Model Engine - legacy
compileOnly "com.ticxo.modelengine:api:R3.1.7"

//Free Minecraft Models
compileOnly group: 'com.magmaguy', name: 'FreeMinecraftModels', version: '1.3.0-SNAPSHOT'

//Advanced AI goals
implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.11.2-SNAPSHOT'

compileOnly group: 'com.magmaguy', name: 'FreeMinecraftModels', version: '1.4.2'
// Mythic Mobs integration - currently only for arenas
compileOnly group: 'io.lumine', name: 'Mythic-Dist', version: '5.3.5'

///Shaded in
implementation group: 'org.bstats', name: 'bstats-bukkit', version: '2.2.1'
implementation group: 'commons-io', name: 'commons-io', version: '2.7'
implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.13.0'
implementation group: 'com.magmaguy', name: 'MagmaCore', version: '1.0-SNAPSHOT'

}

artifacts { // task 'build' runs generates uberjar
Expand All @@ -146,57 +132,22 @@ String packagePath = 'com.magmaguy.shaded'
shadowJar {
dependencies {
relocate('org.bstats', packagePath + '.bstats')
relocate('cloud.commandframework', packagePath + '.cloud')
relocate('net.kyori', packagePath + '.adventure-platform-bukkit')
relocate('io.leangen.geantyref', packagePath + '.geantyref')
relocate('org.reflections', packagePath + '.reflections')
}
archiveClassifier.set(null)
archiveFileName.set(project.name + ".jar")
destinationDirectory.set(new File("testbed/plugins"))
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

ext {
resourceTokens = [
'Version': version
]
}

processResources {
filter ReplaceTokens, tokens: resourceTokens
}

//sonatype repo
task javadocJar(type: Jar) {
classifier = 'javadoc'
from javadoc
}

task sourcesJar(type: Jar) {
classifier = 'sources'
from sourceSets.main.allSource
}

artifacts {
archives javadocJar, sourcesJar
}

ext.isReleaseVersion = !version.contains("SNAPSHOT")

publishing {
repositories {
maven {
def releaseRepo = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotRepo = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
url = isReleaseVersion ? releaseRepo : snapshotRepo
name = "EliteMobs"
url = "http://magmaguy.com:50001/releases"
credentials {
username = project.hasProperty('ossrhUsername') ? ossrhUsername : "Unknown user"
password = project.hasProperty('ossrhPassword') ? ossrhPassword : "Unknown password"
}
allowInsecureProtocol = true
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 0 additions & 29 deletions src/main/java/com/magmaguy/elitemobs/ChatColorConverter.java

This file was deleted.

Loading