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
5 changes: 3 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dependencies {
implementation("org.apache.commons:commons-math4-core:4.0-beta1")
implementation("com.github.ben-manes.caffeine:caffeine:3.2.2")
implementation("com.github.Chronoken:EffectLib:071cc3c")
implementation("org.incendo:cloud-paper:2.0.0-beta.16")
implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.16")
implementation("org.incendo:cloud-paper:2.0.1")
implementation("org.incendo:cloud-minecraft-extras:2.0.1")
implementation("org.incendo:cloud-processors-requirements:1.0.0-rc.1")
implementation("org.bstats:bstats-bukkit:3.2.1")
implementation("com.github.ezylang:EvalEx:3.6.2")
Expand All @@ -19,6 +19,7 @@ dependencies {
implementation(project(path: ":nms:shared"))
implementation(project(path: ":nms:latest"))
implementation(project(path: ":nms:v26_1_2"))
implementation(project(path: ":nms:v26_2"))

compileOnly("com.github.retrooper:packetevents-spigot:2.11.2")
compileOnly("net.dmulloy2:ProtocolLib:5.4.0")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 4.0-Beta-19
version = 4.0-Beta-20
groupId = com.nisovin.magicspells

org.gradle.parallel=true
Expand Down
2 changes: 1 addition & 1 deletion nms/latest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ plugins {
}

dependencies {
paperweight.paperDevBundle("26.2.build.+")
paperweight.paperDevBundle("26.3.build.+")
compileOnly project(":nms:shared")
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
import net.minecraft.core.particles.ColorParticleOption;
import net.minecraft.advancements.triggers.ImpossibleTrigger;
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket.PositionedAdvancement;

public class VolatileCodeLatest extends VolatileCodeHandle {

Expand Down Expand Up @@ -220,24 +221,25 @@ public void sendToastEffect(Player receiver, ItemStack icon, AdvancementDisplay.
}

AdvancementHolder advancement = Advancement.Builder.advancement()
.display(iconNms, textNms, description, null, frame, true, false, true)
.display(iconNms, textNms, description, frame, true, false, true)
.addCriterion("impossible", new Criterion<>(new ImpossibleTrigger(), new ImpossibleTrigger.TriggerInstance()))
.build(TOAST_KEY);

AdvancementProgress progress = new AdvancementProgress();
progress.update(new AdvancementRequirements(List.of(List.of("impossible"))));
progress.grantProgress("impossible");

ServerPlayer player = ((CraftPlayer) receiver).getHandle();
player.connection.send(new ClientboundUpdateAdvancementsPacket(
false,
Collections.singleton(advancement),
List.of(new PositionedAdvancement(advancement, 0, 0)),
Collections.emptySet(),
Collections.singletonMap(TOAST_KEY, progress),
true
));
player.connection.send(new ClientboundUpdateAdvancementsPacket(
false,
Collections.emptySet(),
Collections.emptyList(),
Collections.singleton(TOAST_KEY),
Collections.emptyMap(),
true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public VolatileGlowManagerLatest(VolatileCodeHelper helper) {
MethodType.methodType(void.class, String.class, int.class, Optional.class, Collection.class)
);
} catch (Exception e) {
throw new RuntimeException("Encountered an error while initializing VolatileGlowManagerLatest", e);
throw new RuntimeException("Encountered an error while initializing " + getClass().getSimpleName(), e);
}

helper.registerEvents(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public VolatileGlowManager_v26_1_2(VolatileCodeHelper helper) {
MethodType.methodType(void.class, String.class, int.class, Optional.class, Collection.class)
);
} catch (Exception e) {
throw new RuntimeException("Encountered an error while initializing VolatileGlowManagerLatest", e);
throw new RuntimeException("Encountered an error while initializing " + getClass().getSimpleName(), e);
}

helper.registerEvents(this);
Expand Down
8 changes: 8 additions & 0 deletions nms/v26_2/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
plugins {
id "io.papermc.paperweight.userdev"
}

dependencies {
paperweight.paperDevBundle("26.2.build.+")
compileOnly project(":nms:shared")
}
Loading
Loading