Skip to content

Commit b1491ce

Browse files
UnknownSiliconUnknownSilicon
authored
Merge pull request #76 from ParallelMC/staging
Update to 1.20.4
2 parents 4bc497d + b59be85 commit b1491ce

12 files changed

Lines changed: 50 additions & 29 deletions

File tree

‎api/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
group = 'org.parallelmc'
99

10-
version = '4.2.2'
10+
version = '4.3.0'
1111
description = 'A set of utilities and features for use on the Parallel Minecraft server'
1212

1313
java {
@@ -22,11 +22,11 @@ processResources.filteringCharset = "UTF-8"
2222
dependencies {
2323
implementation 'org.jetbrains:annotations:24.0.1'
2424
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
25-
implementation 'net.dv8tion:JDA:5.0.0-beta.10'
25+
implementation 'net.dv8tion:JDA:5.0.0-beta.20'
2626
compileOnly 'me.clip:placeholderapi:2.11.3'
2727
compileOnly fileTree('libs') { include '*.jar' }
2828
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
29-
implementation 'mysql:mysql-connector-java:8.0.33'
29+
implementation 'com.mysql:mysql-connector-j:8.3.0'
3030
compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0'
3131
compileOnly 'dev.esophose:playerparticles:8.4'
3232
implementation 'org.reflections:reflections:0.10.2'

‎api/src/main/java/parallelmc/parallelutils/commands/Commands.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.bukkit.World;
66
import org.bukkit.block.Block;
77
import org.bukkit.command.*;
8-
import org.bukkit.craftbukkit.v1_20_R1.command.ServerCommandSender;
8+
import org.bukkit.craftbukkit.v1_20_R3.command.ServerCommandSender;
99
import org.bukkit.entity.Player;
1010
import org.jetbrains.annotations.NotNull;
1111
import org.jetbrains.annotations.Nullable;

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
dependencies {
10-
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.20.1-R0.1-SNAPSHOT")
10+
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.20.4-R0.1-SNAPSHOT")
1111
}
1212

1313

@@ -40,9 +40,9 @@ allprojects {
4040
}
4141

4242
dependencies {
43-
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.20.1-R0.1-SNAPSHOT")
43+
paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.20.4-R0.1-SNAPSHOT")
4444

45-
compileOnly "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"
45+
compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT"
4646
compileOnly 'net.luckperms:api:5.4'
4747
compileOnly 'dev.esophose:playerparticles:8.4'
4848
compileOnly "com.github.MilkBowl:VaultAPI:1.7"

‎modules/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ dependencies {
1919

2020
compileOnly 'org.jetbrains:annotations:24.0.1'
2121
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
22-
compileOnly 'net.dv8tion:JDA:5.0.0-beta.10'
22+
compileOnly 'net.dv8tion:JDA:5.0.0-beta.20'
2323
compileOnly 'me.clip:placeholderapi:2.11.3'
2424
compileOnly fileTree('libs') { include '*.jar' }
2525
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
26-
compileOnly 'mysql:mysql-connector-java:8.0.33'
26+
compileOnly 'com.mysql:mysql-connector-j:8.3.0'
2727
compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0'
2828
compileOnly 'dev.esophose:playerparticles:8.4'
29-
compileOnly "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"
29+
compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT"
3030
}
3131

3232
def names = []

‎modules/src/main/java/parallelmc/parallelutils/modules/bitsandbobs/minimodules/KeepSpecialItems.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.minecraft.nbt.CompoundTag;
44
import org.bukkit.Material;
5-
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
5+
import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
66
import org.bukkit.event.EventHandler;
77
import org.bukkit.event.EventPriority;
88
import org.bukkit.event.Listener;

‎modules/src/main/java/parallelmc/parallelutils/modules/bitsandbobs/minimodules/SpecialItems.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.bukkit.Bukkit;
55
import org.bukkit.Material;
66
import org.bukkit.NamespacedKey;
7-
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
7+
import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
88
import org.bukkit.event.EventHandler;
99
import org.bukkit.event.EventPriority;
1010
import org.bukkit.event.Listener;

‎modules/src/main/java/parallelmc/parallelutils/modules/charms/handlers/impl/CharmParticleHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.bukkit.Material;
55
import org.bukkit.Particle;
66
import org.bukkit.block.data.BlockData;
7-
import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData;
7+
import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
88
import org.bukkit.entity.Player;
99
import org.bukkit.inventory.ItemStack;
1010
import org.bukkit.scheduler.BukkitRunnable;

‎modules/src/main/java/parallelmc/parallelutils/modules/charms/listeners/PlayerJoinContainerListenerOverwrite.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minecraft.world.inventory.*;
66
import net.minecraft.world.item.ItemStack;
77
import org.bukkit.Bukkit;
8-
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
8+
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
99
import org.bukkit.entity.Player;
1010
import org.bukkit.event.EventHandler;
1111
import org.bukkit.event.EventPriority;
@@ -26,9 +26,9 @@ public PlayerJoinContainerListenerOverwrite() {
2626
Field field;
2727
Field field1;
2828
try {
29-
field = ServerPlayer.class.getDeclaredField("cW");
29+
field = ServerPlayer.class.getDeclaredField("dc");
3030
field.setAccessible(true);
31-
field1 = ServerPlayer.class.getDeclaredField("cX");
31+
field1 = ServerPlayer.class.getDeclaredField("dd");
3232
field1.setAccessible(true);
3333
} catch (NoSuchFieldException e) {
3434
e.printStackTrace();

‎modules/src/main/java/parallelmc/parallelutils/modules/charms/util/EnchantGlow.java‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.papermc.paper.enchantments.EnchantmentRarity;
44
import net.kyori.adventure.text.Component;
55
import org.bukkit.NamespacedKey;
6+
import org.bukkit.Registry;
67
import org.bukkit.enchantments.Enchantment;
78
import org.bukkit.enchantments.EnchantmentTarget;
89
import org.bukkit.entity.EntityCategory;
@@ -15,8 +16,11 @@
1516
import java.util.Set;
1617

1718
public class EnchantGlow extends Enchantment {
19+
20+
private final NamespacedKey key;
21+
1822
public EnchantGlow(@NotNull NamespacedKey key) {
19-
super(key);
23+
this.key = key;
2024
}
2125

2226
@Override
@@ -74,6 +78,16 @@ public boolean isDiscoverable() {
7478
return false;
7579
}
7680

81+
@Override
82+
public int getMinModifiedCost(int level) {
83+
return 0;
84+
}
85+
86+
@Override
87+
public int getMaxModifiedCost(int level) {
88+
return 0;
89+
}
90+
7791
@Override
7892
public @NotNull EnchantmentRarity getRarity() {
7993
return EnchantmentRarity.COMMON;
@@ -97,19 +111,24 @@ public float getDamageIncrease(int level, @NotNull EntityCategory entityCategory
97111
public static EnchantGlow instance = null;
98112

99113
public static void registerFakeGlow(ParallelUtils puPlugin) {
100-
try {
101-
Field f = Enchantment.class.getDeclaredField("acceptingNew");
102-
f.setAccessible(true);
103-
f.set(null, true);
104-
} catch (Exception e) {
105-
e.printStackTrace();
106-
}
114+
// try {
115+
// Field f = Enchantment.class.getDeclaredField("acceptingNew");
116+
// f.setAccessible(true);
117+
// f.set(null, true);
118+
// } catch (Exception e) {
119+
// e.printStackTrace();
120+
// }
107121

108122
try {
109123
instance = new EnchantGlow(new NamespacedKey(puPlugin, "glow"));
110-
Enchantment.registerEnchantment(instance);
124+
111125
} catch (Exception e) {
112126
e.printStackTrace();
113127
}
114128
}
129+
130+
@Override
131+
public @NotNull NamespacedKey getKey() {
132+
return key;
133+
}
115134
}

‎modules/src/main/java/parallelmc/parallelutils/modules/custommobs‎

0 commit comments

Comments
 (0)