Skip to content

add support for 1.21.4, fix slimefun api breaking changes #13

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

Open
alexsvorada wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for 1.21.4, fix slimefun api breaking changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>6bc1b1f474</version>
<version>experimental-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand All @@ -48,7 +48,7 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/j3fftw/soundmuffler/SoundMuffler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void onEnable() {
}

SOUND_MUFFLER = new ItemGroup(new NamespacedKey(this, "sound_muffler"),
new CustomItemStack(Material.BEACON, "&7SoundMuffler", "", "&a> Click to open"));
CustomItemStack.create(Material.BEACON, "&7SoundMuffler", "", "&a> Click to open"));

new SoundMufflerListener(this).start();

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/dev/j3fftw/soundmuffler/SoundMufflerMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ public SoundMufflerMachine() {
super(SoundMuffler.SOUND_MUFFLER,
new SlimefunItemStack(ITEM_ID, Material.WHITE_CONCRETE, ITEM_NAME,
"", "&7Muffles all sound in a", "&78 block radius", "", "&e\u26A1 Requires power to use"
),
).item(),
ITEM_ID,
RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {
new ItemStack(Material.WHITE_WOOL), SlimefunItems.STEEL_PLATE, new ItemStack(Material.WHITE_WOOL),
SlimefunItems.STEEL_PLATE, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.STEEL_PLATE,
new ItemStack(Material.WHITE_WOOL), SlimefunItems.STEEL_PLATE, new ItemStack(Material.WHITE_WOOL)
new ItemStack(Material.WHITE_WOOL), SlimefunItems.STEEL_PLATE.item(), new ItemStack(Material.WHITE_WOOL),
SlimefunItems.STEEL_PLATE.item(), SlimefunItems.ELECTRIC_MOTOR.item(), SlimefunItems.STEEL_PLATE.item(),
new ItemStack(Material.WHITE_WOOL), SlimefunItems.STEEL_PLATE.item(), new ItemStack(Material.WHITE_WOOL)
}

);
Expand All @@ -69,9 +69,9 @@ public void newInstance(@Nonnull final BlockMenu menu, @Nonnull final Block b) {
enabled = Boolean.parseBoolean(BlockStorage.getLocationInfo(b.getLocation(), "enabled"));
}

menu.replaceExistingItem(8, new CustomItemStack((enabled ? Material.REDSTONE : Material.GUNPOWDER),
menu.replaceExistingItem(8, CustomItemStack.create((enabled ? Material.REDSTONE : Material.GUNPOWDER),
"&7Enabled: " + (enabled ? "&a✔" : "&4✘"), "", "&e> Click to enable this Machine"));
menu.replaceExistingItem(0, new CustomItemStack(Material.PAPER,
menu.replaceExistingItem(0, CustomItemStack.create(Material.PAPER,
"&eVolume: &b" + volume,
"&7Valid value range: 0-100",
"&7L-click: -10",
Expand Down Expand Up @@ -125,7 +125,7 @@ public int[] getSlotsAccessedByItemTransport(ItemTransportFlow flow) {

protected void constructMenu(BlockMenuPreset preset) {
for (int i : border) {
preset.addItem(i, new CustomItemStack(Material.GRAY_STAINED_GLASS_PANE, " "),
preset.addItem(i, CustomItemStack.create(Material.GRAY_STAINED_GLASS_PANE, " "),
(player, i1, itemStack, clickAction) -> false);
}
}
Expand Down