Skip to content

fix(deps): update dependency net.onelitefeather:aonyx-bom to v0.8.1 #89

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.

Sign up for GitHub

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

Merged
theEvilReaper merged 2 commits into from
Jul 24, 2026
Merged

fix(deps): update dependency net.onelitefeather:aonyx-bom to v0.8.1 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceb4006
fix(deps): update dependency net.onelitefeather:aonyx-bom to v0.8.1
renovate[bot] Jul 24, 2026
b61a7c0
chore: migrate InventoryLayout import
theEvilReaper Jul 24, 2026
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
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("shadow", "9.6.1")
version("aonyx", "0.8.0")
version("aonyx", "0.8.1")
version("pvp", "2026.05.30-26.1.1")
version("cloudnet", "4.0.0-RC17-SNAPSHOT")
version("slf4j", "2.0.18")
Expand Down
7 changes: 0 additions & 7 deletions setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ public GameMapBuilder(@NotNull GameMap gameMap) {
return this;
}

/**
* Clears all builders from the data structure.
*/
public void clearBuilders() {
this.builders.clear();
}

/**
* Builds a new {@link GameMap} instance with the current properties.
*
Expand Down
2 changes: 1 addition & 1 deletion setup/src/main/java/net/theevilreaper/bounce/setup/inventory/MapSetupInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.click.ClickHolder;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.aves.map.MapEntry;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.click.ClickHolder;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.event.ground.PlayerGroundBlockSelectEvent;
Expand Down Expand Up @@ -40,7 +40,7 @@
for (int i = 0; i < slots.length && iterator.hasNext(); i++) {
Material currentMaterial = iterator.next();
ItemStack stack = ItemStack.builder(currentMaterial)
.customName(Component.translatable(currentMaterial.registry().translationKey(), NamedTextColor.AQUA))

Check warning on line 43 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Material has been deprecated and marked for removal

Check warning on line 43 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Material has been deprecated and marked for removal
.build();
layout.setItem(slots[i], stack, this::handleClick);
}
Expand Down
2 changes: 1 addition & 1 deletion ...p/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net.minestom.server.inventory.click.Click;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
import net.theevilreaper.aves.inventory.click.ClickHolder;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
Expand Down Expand Up @@ -45,7 +45,7 @@
this.setDataLayoutFunction(dataLayoutFunction -> {
InventoryLayout dataLayout = dataLayoutFunction == null ? InventoryLayout.fromType(getType()) : dataLayoutFunction;
dataLayout.blank(LayoutCalculator.from(BLOCK_SLOT, VALUE_SLOT));
Material material = pushEntry.getBlock().registry().material();

Check warning on line 48 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Block has been deprecated and marked for removal

Check warning on line 48 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Block has been deprecated and marked for removal
dataLayout.setItem(BLOCK_SLOT, ItemStack.builder(material).build(), this::handleBlockClick);
dataLayout.setItem(VALUE_SLOT, LoreHelper.getPushValue(pushEntry), this::handlePushButtonClick);
return dataLayout;
Expand Down
2 changes: 1 addition & 1 deletion setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import net.minestom.server.inventory.click.Click;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
import net.theevilreaper.aves.inventory.click.ClickHolder;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
Expand Down Expand Up @@ -57,13 +57,13 @@
InventoryLayout dataLayout = dataLayoutFunction == null ? InventoryLayout.fromType(getType()) : dataLayoutFunction;
dataLayout.blank(PUSH_SLOTS);

dataLayout.setItem(10, new MaterialSlot(gameMapBuilder.getGroundBlockEntry().getBlock().registry().material()), this::handleGroundButton);

Check warning on line 60 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Block has been deprecated and marked for removal

Check warning on line 60 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Block has been deprecated and marked for removal
List<PushEntry> pushEntries = gameMapBuilder.getPushDataBuilder().getPushValues();

for (int i = 1; i < pushEntries.size(); i++) {
int inventorySlot = PUSH_SLOTS[i - 1];
PushEntry pushEntry = pushEntries.get(i);
Material material = pushEntry.getBlock().registry().material();

Check warning on line 66 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Block has been deprecated and marked for removal

Check warning on line 66 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Block has been deprecated and marked for removal
ItemStack itemStack = getSlotItem(material, i);
dataLayout.setItem(inventorySlot, new MaterialSlot(itemStack), this::handlePushButton);
}
Expand Down Expand Up @@ -113,7 +113,7 @@

private @NotNull ItemStack getSlotItem(@NotNull Material material, int slotId) {
return ItemStack.builder(material)
.customName(Component.translatable(material.registry().translationKey(), NamedTextColor.AQUA))

Check warning on line 116 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Material has been deprecated and marked for removal

Check warning on line 116 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Material has been deprecated and marked for removal
.lore(PUSH_LORE)
.set(PUSH_SLOT_INDEX, slotId)
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import net.kyori.adventure.text.Component;
import net.minestom.server.entity.Player;
import net.minestom.server.inventory.InventoryType;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.slot.ISlot;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
Expand Down
2 changes: 1 addition & 1 deletion setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.click.ClickHolder;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.event.SetupInventorySwitchEvent.SwitchTarget;
Expand Down Expand Up @@ -45,7 +45,7 @@
for (int i = 0; i < itemSlots.length && i < allowedPushBlocks.size(); i++) {
Material currentMaterial = allowedPushBlocks.get(i);
ItemStack stack = ItemStack.builder(currentMaterial)
.customName(Component.translatable(currentMaterial.registry().translationKey(), NamedTextColor.AQUA))

Check warning on line 48 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Material has been deprecated and marked for removal

Check warning on line 48 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Material has been deprecated and marked for removal
.build();
layout.setItem(itemSlots[i], stack, this::handleClick);
}
Expand Down
4 changes: 2 additions & 2 deletions setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import net.minestom.server.inventory.InventoryType;
import net.minestom.server.inventory.click.Click;
import net.minestom.server.item.ItemStack;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
import net.theevilreaper.aves.inventory.click.ClickHolder;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
Expand Down Expand Up @@ -48,13 +48,13 @@
if (index < 0 || index >= this.gameMapBuilder.getPushDataBuilder().getPushValues().size()) {
throw new IndexOutOfBoundsException("Invalid push entry index: " + index);
}
this.setDataLayoutFunction(dataLayoutFunction -> {
this.setDataLayoutFunction(dataLayoutFunction -> {
InventoryLayout dataLayout = dataLayoutFunction == null ? InventoryLayout.fromType(getType()) : dataLayoutFunction;

dataLayout.blank(LayoutCalculator.from(BLOCK_SLOT, VALUE_SLOT));
PushEntry pushEntry = this.gameMapBuilder.getPushDataBuilder().getPushValues().get(index);

ItemStack stack = ItemStack.builder(pushEntry.getBlock().registry().material())

Check warning on line 57 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (ubuntu-latest) 

[removal] registry() in Block has been deprecated and marked for removal

Check warning on line 57 in setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java

View workflow job for this annotation

GitHub Actions / build / Build (macos-latest) 

[removal] registry() in Block has been deprecated and marked for removal
.build();

dataLayout.setItem(BLOCK_SLOT, stack, this::handleBlockClick);
Expand Down
3 changes: 2 additions & 1 deletion setup/src/test/java/net/theevilreaper/bounce/setup/SlotAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.theevilreaper.aves.inventory.InventoryLayout;

import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.slot.ISlot;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion ...evilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import net.minestom.server.item.Material;
import net.minestom.testing.Env;
import net.minestom.testing.extension.MicrotusExtension;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.slot.ISlot;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.inventory.SetupBlocks;
Expand Down
2 changes: 1 addition & 1 deletion ...a/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net.minestom.server.item.Material;
import net.minestom.testing.Env;
import net.minestom.testing.extension.MicrotusExtension;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.slot.ISlot;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...et/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import net.minestom.server.item.ItemStack;
import net.minestom.testing.Env;
import net.minestom.testing.extension.MicrotusExtension;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.slot.ISlot;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import net.minestom.server.item.Material;
import net.minestom.testing.Env;
import net.minestom.testing.extension.MicrotusExtension;
import net.theevilreaper.aves.inventory.InventoryLayout;
import net.theevilreaper.aves.inventory.layout.InventoryLayout;
import net.theevilreaper.aves.inventory.slot.ISlot;
import net.theevilreaper.aves.inventory.util.LayoutCalculator;
import net.theevilreaper.bounce.setup.inventory.SetupBlocks;
Expand Down
Loading