Skip to content
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
8 changes: 4 additions & 4 deletions api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

group = 'org.parallelmc'

version = '4.4.0'
version = '4.5.0'
description = 'A set of utilities and features for use on the Parallel Minecraft server'

java {
Expand All @@ -28,17 +28,17 @@ repositories {

dependencies {
//compileOnly 'io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT'
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT")
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.3-R0.1-SNAPSHOT")

implementation 'org.jetbrains:annotations:24.0.1'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
implementation 'net.dv8tion:JDA:5.0.0-beta.24'
compileOnly 'me.clip:placeholderapi:2.11.6'
compileOnly fileTree('libs') { include '*.jar' }
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.10'
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.12'
implementation 'com.mysql:mysql-connector-j:8.3.0'
compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0'
compileOnly 'dev.esophose:playerparticles:8.6'
compileOnly 'dev.esophose:playerparticles:8.7'
implementation 'org.reflections:reflections:0.10.2'
}

Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
plugins {
id 'java'
id 'io.github.goooler.shadow' version '8.1.7'
id "io.papermc.paperweight.userdev" version "1.7.1"
id "xyz.jpenilla.run-paper" version "2.3.0"
id "io.papermc.paperweight.userdev" version "1.7.4"
id "xyz.jpenilla.run-paper" version "2.3.1"
id 'net.minecrell.plugin-yml.bukkit' version '0.6.0'
}

Expand All @@ -15,7 +15,7 @@ java {
paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.getMOJANG_PRODUCTION()

dependencies {
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT")
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.3-R0.1-SNAPSHOT")
}

compileJava.options.encoding = "UTF-8"
Expand All @@ -42,12 +42,12 @@ allprojects {
}

dependencies {
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT")
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.3-R0.1-SNAPSHOT")
//paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT")

//compileOnly "io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT"
compileOnly 'net.luckperms:api:5.4'
compileOnly 'dev.esophose:playerparticles:8.6'
compileOnly 'dev.esophose:playerparticles:8.7'
compileOnly "com.github.MilkBowl:VaultAPI:1.7.1"
}
}
6 changes: 3 additions & 3 deletions modules/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ dependencies {
compileOnly 'net.dv8tion:JDA:5.0.0-beta.24'
compileOnly 'me.clip:placeholderapi:2.11.6'
compileOnly fileTree('libs') { include '*.jar' }
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.10'
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.12'
compileOnly 'com.mysql:mysql-connector-j:8.3.0'
compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0'
compileOnly 'dev.esophose:playerparticles:8.6'
compileOnly "io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT"
compileOnly 'dev.esophose:playerparticles:8.7'
compileOnly "io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT"
}

def names = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,15 @@ public void onEnable() {

manager.registerEvents(new DoorKnocker(), plugin);
manager.registerEvents(new SpecialItems(), plugin);
manager.registerEvents(new SpeedyMinecarts(), plugin);
manager.registerEvents(new OnPvp(), plugin);
manager.registerEvents(new ShardLotto(), plugin);
manager.registerEvents(new ChickenFeatherDrops(), plugin);
manager.registerEvents(new EntityTweaks(), plugin);

if (config.getBoolean("speedy-minecarts", false)) {
manager.registerEvents(new SpeedyMinecarts(), plugin);
}

if (config.getBoolean("disable-ender-chests", false)) {
manager.registerEvents(new DisableEnderChest(), plugin);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void onShibaInuSpawn(CreatureSpawnEvent event) {
// Check if the wolf is a shiba inu variant
if (wolf.getVariant().getKey().equals(NamespacedKey.fromString("parallel:shiba_inu"))) {
// Set scale to 0.8
AttributeInstance scale = wolf.getAttribute(Attribute.GENERIC_SCALE);
AttributeInstance scale = wolf.getAttribute(Attribute.SCALE);
if (scale != null) {
scale.setBaseValue(0.8D);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void checkForDonors() {

// Check if recipient needs to be healed
double recipientHealth = recipient.getHealth();
double recipientMaxHealth = recipient.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue();
double recipientMaxHealth = recipient.getAttribute(Attribute.MAX_HEALTH).getBaseValue();
if (!(recipientHealth < recipientMaxHealth)) {
return;
}
Expand Down
Loading