Skip to content
Open
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
6 changes: 4 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,10 @@ signing {

nmcp {
publishAllProjectsProbablyBreakingProjectIsolation {
username.set(findProperty("mavenCentralUsername") as String)
password.set(findProperty("mavenCentralPassword") as String)
val mavenUsername = findProperty("mavenCentralUsername")
val mavenPassword = findProperty("mavenCentralPassword")
username.set(if (mavenUsername != null) mavenUsername as String else "")
password.set(if (mavenPassword != null) mavenPassword as String else "")
publicationType = "AUTOMATIC"
}
}
37 changes: 26 additions & 11 deletions src/main/java/com/jeff_media/customblockdata/CustomBlockData.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,26 @@

package com.jeff_media.customblockdata;

import org.bukkit.*;
import java.io.IOException;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.AbstractMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.persistence.PersistentDataAdapterContext;
Expand All @@ -34,15 +53,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.io.IOException;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import com.jeff_media.customblockdata.events.CustomBlockDataSavedEvent;

/**
* Represents a {@link PersistentDataContainer} for a specific {@link Block}. Also provides some static utility methods
Expand Down Expand Up @@ -439,7 +450,8 @@ public void clear() {
}

/**
* Saves the block's {@link PersistentDataContainer} inside the chunk's PersistentDataContainer
* Saves the block's {@link PersistentDataContainer} inside the chunk's PersistentDataContainer.
* Fires the {@link CustomBlockDataSavedEvent} event after saving.
*/
private void save() {
setDirty(plugin, blockEntry);
Expand All @@ -448,6 +460,9 @@ private void save() {
} else {
chunk.getPersistentDataContainer().set(key, PersistentDataType.TAG_CONTAINER, pdc);
}

CustomBlockDataSavedEvent event = new CustomBlockDataSavedEvent(this);
Bukkit.getPluginManager().callEvent(event);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.jeff_media.customblockdata.CustomBlockData;
import org.bukkit.block.Block;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import org.bukkit.block.Block;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.jeff_media.customblockdata.events;

import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.persistence.PersistentDataContainer;
import org.jetbrains.annotations.NotNull;

import com.jeff_media.customblockdata.CustomBlockData;

/**
* Called when a CustomBlockData is saved into the chunk's
* {@link PersistentDataContainer} See {@link CustomBlockData#save()}.
*
* @param customBlockData the {@link CustomBlockData} that was saved
*/
public class CustomBlockDataSavedEvent extends Event {

private static final HandlerList HANDLERS_LIST = new HandlerList();

private final CustomBlockData customBlockData;

public CustomBlockDataSavedEvent(@NotNull CustomBlockData customBlockData) {
this.customBlockData = customBlockData;
}

public @NotNull CustomBlockData getCustomBlockData() {
return customBlockData;
}

@Override
public HandlerList getHandlers() {
return HANDLERS_LIST;
}

public static HandlerList getHandlerList() {
return HANDLERS_LIST;
}

}