Skip to content
This repository was archived by the owner on May 22, 2024. It is now read-only.
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/.project
.idea
/*.iml
/bin
13 changes: 7 additions & 6 deletions src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@

package com.thezorro266.bukkit.srm;

import com.thezorro266.bukkit.srm.exceptions.ContentSaveException;
import com.thezorro266.bukkit.srm.factories.RegionFactory;
import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate;
import java.text.MessageFormat;
import java.util.ArrayList;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.World;
Expand All @@ -30,8 +29,10 @@
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.text.MessageFormat;
import java.util.ArrayList;
import com.thezorro266.bukkit.srm.exceptions.ContentSaveException;
import com.thezorro266.bukkit.srm.factories.RegionFactory;
import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate;

public class CommandHandler implements CommandExecutor {

Expand Down
29 changes: 19 additions & 10 deletions src/main/java/com/thezorro266/bukkit/srm/EventListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
package com.thezorro266.bukkit.srm;

import java.text.MessageFormat;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -27,16 +29,19 @@
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.event.player.PlayerInteractEvent;

import com.thezorro266.bukkit.srm.customevent.PrePlayerClickSignEvent;
import com.thezorro266.bukkit.srm.exceptions.ContentSaveException;
import com.thezorro266.bukkit.srm.factories.SignFactory;
import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
import com.thezorro266.bukkit.srm.helpers.Location;
import com.thezorro266.bukkit.srm.scheduler.ClickSignTask;
import com.thezorro266.bukkit.srm.templates.Template;

public class EventListener implements Listener {
public EventListener() {
SimpleRegionMarket.getInstance().getServer().getPluginManager()
.registerEvents(this, SimpleRegionMarket.getInstance());
.registerEvents(this, SimpleRegionMarket.getInstance());
}

@EventHandler
Expand Down Expand Up @@ -75,16 +80,16 @@ public void onBlockBreak(BlockBreakEvent event) {
} catch (ContentSaveException e) {
if (event.getPlayer() != null)
event.getPlayer()
.sendMessage(
ChatColor.RED
+ LanguageSupport.instance
.getString("region.save.problem.playermsg"));
.sendMessage(
ChatColor.RED
+ LanguageSupport.instance
.getString("region.save.problem.playermsg"));

SimpleRegionMarket
.getInstance()
.getLogger()
.severe(MessageFormat.format(LanguageSupport.instance
.getString("region.save.problem.console"), sign.getRegion().getName()));
.getInstance()
.getLogger()
.severe(MessageFormat.format(LanguageSupport.instance
.getString("region.save.problem.console"), sign.getRegion().getName()));
SimpleRegionMarket.getInstance().printError(e);
}
} else {
Expand All @@ -101,7 +106,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
if (event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
Sign sign = SignFactory.instance.getSignFromLocation(Location.fromBlock(event.getClickedBlock()));
if (sign != null) {
sign.getRegion().getTemplate().clickSign(event.getPlayer(), sign);
PrePlayerClickSignEvent playerEvent = new PrePlayerClickSignEvent(event.getPlayer(), sign); // Create the event here
Bukkit.getServer().getPluginManager().callEvent(playerEvent); // Call the event
if (!playerEvent.isCancelled()) {
Bukkit.getScheduler().runTaskLater(SimpleRegionMarket.getInstance(), new ClickSignTask(event.getPlayer(), sign), 1L);
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

import lombok.Getter;

public final class LanguageSupport {
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/thezorro266/bukkit/srm/PlayerManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@

package com.thezorro266.bukkit.srm;

import com.thezorro266.bukkit.srm.factories.RegionFactory;
import com.thezorro266.bukkit.srm.helpers.RegionOwner;
import com.thezorro266.bukkit.srm.templates.Template;
import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate;
import java.util.ArrayList;
import java.util.Iterator;

import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;

import java.util.ArrayList;
import java.util.Iterator;
import com.thezorro266.bukkit.srm.factories.RegionFactory;
import com.thezorro266.bukkit.srm.helpers.RegionOwner;
import com.thezorro266.bukkit.srm.templates.Template;
import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate;

public class PlayerManager implements Listener {
private final ArrayList<RegionOwner> ownerList = new ArrayList<RegionOwner>();
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,22 @@
import java.text.MessageFormat;
import java.util.logging.Level;

import com.thezorro266.bukkit.srm.hooks.*;
import lombok.Getter;

import org.bukkit.plugin.java.JavaPlugin;

import com.thezorro266.bukkit.srm.exceptions.ContentLoadException;
import com.thezorro266.bukkit.srm.exceptions.TemplateFormatException;
import com.thezorro266.bukkit.srm.factories.RegionFactory;
import com.thezorro266.bukkit.srm.helpers.LocationSignHelper;
import com.thezorro266.bukkit.srm.helpers.WorldHelper;
import com.thezorro266.bukkit.srm.hooks.BasicPermissions;
import com.thezorro266.bukkit.srm.hooks.Economy;
import com.thezorro266.bukkit.srm.hooks.NoEconomy;
import com.thezorro266.bukkit.srm.hooks.Permissions;
import com.thezorro266.bukkit.srm.hooks.VaultEconomy;
import com.thezorro266.bukkit.srm.hooks.VaultHook;
import com.thezorro266.bukkit.srm.hooks.VaultPermissions;
import com.thezorro266.bukkit.srm.templates.Template;
import com.thezorro266.bukkit.srm.templates.interfaces.TimedTemplate;

Expand Down Expand Up @@ -153,7 +161,6 @@ public void onEnable() {
// Register events
playerManager.registerEvents();
new EventListener();

// Set command executor
getCommand(SRM_COMMAND).setExecutor(new CommandHandler());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,23 @@
package com.thezorro266.bukkit.srm;

import static com.thezorro266.bukkit.srm.factories.SignFactory.Sign.SIGN_LINE_COUNT;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

import lombok.Getter;

import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;

import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.thezorro266.bukkit.srm.exceptions.ContentLoadException;
import com.thezorro266.bukkit.srm.exceptions.ContentSaveException;
Expand Down Expand Up @@ -194,7 +198,6 @@ private void updateAgents(YamlConfiguration agentsYaml) throws TemplateFormatExc
load();
}

@SuppressWarnings("HardCodedStringLiteral")
private void update(File templateFile, YamlConfiguration templateYaml) throws TemplateFormatException, IOException {

// Old
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/thezorro266/bukkit/srm/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/**
* Class with several util functions.
*/
@SuppressWarnings("HardCodedStringLiteral")
public class Utils {
/**
* Generates a string, which represents the time left until the given time.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;

import lombok.Getter;

import org.bukkit.Bukkit;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.UnknownDependencyException;

import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.CuboidClipboard;
import com.sk89q.worldedit.EditSession;
Expand Down Expand Up @@ -157,6 +160,7 @@ public void saveRegionToSchematic(RegionFactory.Region region) throws IOExceptio
}
}

@SuppressWarnings("deprecation")
public CuboidClipboard getClipboardFromRegion(RegionFactory.Region region) {
if (region.getWorldguardRegion() instanceof ProtectedCuboidRegion) {
ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region.getWorldguardRegion();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import java.lang.ref.WeakReference;
import java.util.Set;
import java.util.WeakHashMap;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.UnknownDependencyException;

import com.sk89q.wepif.PermissionsResolverManager;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldguard.LocalPlayer;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.thezorro266.bukkit.srm.customevent;

import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

import com.thezorro266.bukkit.srm.factories.SignFactory;

public final class PlayerRentRegionEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private Player player;
private SignFactory.Sign sign;
private boolean cancelled;

public PlayerRentRegionEvent(Player player, SignFactory.Sign sign) {
this.player = player;
this.sign = sign;
}

public Player getPlayer() {
return player;
}

public SignFactory.Sign getSign() {
return sign;
}

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

public static HandlerList getHandlerList() {
return handlers;
}

@Override
public boolean isCancelled() {
return cancelled;
}

@Override
public void setCancelled(boolean arg0) {
this.cancelled = arg0;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.thezorro266.bukkit.srm.customevent;

import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

import com.thezorro266.bukkit.srm.factories.SignFactory;

public final class PrePlayerClickSignEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private Player player;
private SignFactory.Sign sign;
private boolean cancelled;

public PrePlayerClickSignEvent(Player player, SignFactory.Sign sign) {
this.player = player;
this.sign = sign;
}

public Player getPlayer() {
return player;
}

public SignFactory.Sign getSign() {
return sign;
}

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

public static HandlerList getHandlerList() {
return handlers;
}

@Override
public boolean isCancelled() {
return cancelled;
}

@Override
public void setCancelled(boolean arg0) {
this.cancelled = arg0;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.thezorro266.bukkit.srm.customevent;

import org.bukkit.OfflinePlayer;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

import com.thezorro266.bukkit.srm.factories.RegionFactory;
import com.thezorro266.bukkit.srm.templates.TemplateRent;

public class RegionExpireEvent extends Event {
private static final HandlerList handlers = new HandlerList();
private RegionFactory.Region region;
private OfflinePlayer customer;
private OfflinePlayer owner;
private TemplateRent template;

public RegionExpireEvent(RegionFactory.Region region, OfflinePlayer customer, OfflinePlayer owner, TemplateRent template) {
this.region = region;
this.customer = customer;
this.owner = owner;
this.template = template;
}


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

public static HandlerList getHandlerList() {
return handlers;
}

public RegionFactory.Region getRegion() {
return region;
}

public OfflinePlayer getCustomer() {
return customer;
}

public OfflinePlayer getOwner() {
return owner;
}


public TemplateRent getTemplate() {
return template;
}
}
Loading