Famous_Longwing/RealEstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General cleanup, unused imports and depricated.... stuff....

Browse Source
This commit is contained in:
Famous_Longwing 2024-02-25 17:15:21 -05:00
parent 4ddbd29e96
commit e1096b1e84
6 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/me/EtienneDx/RealEstate/AbandonedItems.java
View File

@ -3,14 +3,10 @@ package me.EtienneDx.RealEstate;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.bouncycastle.util.Arrays;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -154,7 +150,7 @@ public class AbandonedItems extends YamlConfiguration
try {
c.save(file);
} catch (IOException e) {
// TODO Auto-generated catch block
//e.printStackTrace();
RealEstate.instance.log.info("Failed to save, got exception: "+e.getMessage());
}

11
src/me/EtienneDx/RealEstate/RECommand.java
View File

@ -259,7 +259,7 @@ public class RECommand extends BaseCommand
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(other);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferCreatedByOther,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferCreatedByOther,
player.getName(), claimType, RealEstate.econ.format(price), location));
}
}
@ -301,7 +301,8 @@ public class RECommand extends BaseCommand
{
User u = RealEstate.ess.getUser(other);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferAcceptedByOther,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferAcceptedByOther,
player.getName(), claimType, RealEstate.econ.format(bt.exitOffer.price), location));
}
}
@ -350,7 +351,8 @@ public class RECommand extends BaseCommand
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(other);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferRejectedByOther,
u.sendMail(null,Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferRejectedByOther,
player.getName(), claimType, location));
}
}
@ -384,7 +386,8 @@ public class RECommand extends BaseCommand
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(other);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferCancelledByOther,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoExitOfferCancelledByOther,
player.getName(), claimType, location));
}
}

10
src/me/EtienneDx/RealEstate/REListener.java
View File

@ -6,7 +6,8 @@ import java.util.regex.Pattern;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.block.Sign;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.block.sign.Side;
import org.bukkit.block.sign.SignSide;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@ -410,9 +411,12 @@ public class REListener implements Listener
event.getClickedBlock().getState() instanceof Sign)
{
Sign sign = (Sign)event.getClickedBlock().getState();
RealEstate.instance.log.info(sign.getLine(0));
Sign thissign = (Sign)event.getClickedBlock().getState();
SignSide sign=thissign.getSide(Side.valueOf("FRONT"));
//RealEstate.instance.log.info(sign.getLine(0));
// it is a real estate sign
if(ChatColor.stripColor(sign.getLine(0)).equalsIgnoreCase(ChatColor.stripColor(
Messages.getMessage(RealEstate.instance.config.cfgSignsHeader, false))))
{

2
src/me/EtienneDx/RealEstate/RealEstate.java
View File

@ -12,10 +12,8 @@ import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Logger;
import java.util.stream.Stream;

41
src/me/EtienneDx/RealEstate/Transactions/ClaimLease.java
View File

@ -11,6 +11,8 @@ import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.block.Sign;
import org.bukkit.block.sign.Side;
import org.bukkit.block.sign.SignSide;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -65,8 +67,10 @@ public class ClaimLease extends BoughtTransaction
{
if(sign.getBlock().getState() instanceof Sign)
{
Sign s = (Sign)sign.getBlock().getState();
s.setWaxed(true);
Sign thissign = (Sign)sign.getBlock().getState();
SignSide s=thissign.getSide(Side.valueOf("FRONT"));
thissign.setWaxed(true);
s.setLine(0, Messages.getMessage(RealEstate.instance.config.cfgSignsHeader, false));
s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceLease);
//s.setLine(2, owner != null ? Bukkit.getOfflinePlayer(owner).getName() : "SERVER");
@ -94,7 +98,7 @@ public class ClaimLease extends BoughtTransaction
}
}
s.setLine(3, Utils.getTime(frequency, null, false));
s.update(true);
thissign.update(true);
}
else
{
@ -148,7 +152,8 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.buyer);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentBuyer,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentBuyer,
claimType,
location,
RealEstate.econ.format(price),
@ -169,7 +174,8 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.owner);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentOwner,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentOwner,
buyerPlayer.getName(),
claimType,
location,
@ -190,7 +196,8 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.buyer);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentBuyerFinal,
u.sendMail(null,Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentBuyerFinal,
claimType,
location,
RealEstate.econ.format(price)));
@ -207,7 +214,8 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.owner);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentOwnerFinal,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentOwnerFinal,
buyerPlayer.getName(),
claimType,
location,
@ -253,7 +261,8 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.buyer);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentBuyerCancelled,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentBuyerCancelled,
claimType,
location,
RealEstate.econ.format(price)));
@ -269,7 +278,8 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.owner);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentOwnerCancelled,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimInfoLeasePaymentOwnerCancelled,
buyerPlayer.getName(),
claimType,
location,
@ -391,12 +401,13 @@ public class ClaimLease extends BoughtTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(this.owner);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimOwnerLeaseStarted,
player.getName(),
claimTypeDisplay,
RealEstate.econ.format(price),
location,
paymentsLeft + ""));
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimOwnerLeaseStarted,
player.getName(),
claimTypeDisplay,
RealEstate.econ.format(price),
location,
paymentsLeft + ""));
}
}

13
src/me/EtienneDx/RealEstate/Transactions/ClaimSell.java
View File

@ -18,6 +18,8 @@ import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.block.Sign;
import org.bukkit.block.sign.Side;
import org.bukkit.block.sign.SignSide;
import org.bukkit.command.CommandSender;
public class ClaimSell extends ClaimTransaction
@ -37,8 +39,10 @@ public class ClaimSell extends ClaimTransaction
{
if(sign.getBlock().getState() instanceof Sign)
{
Sign s = (Sign) sign.getBlock().getState();
s.setWaxed(true);
Sign thissign = (Sign) sign.getBlock().getState();
SignSide s=thissign.getSide(Side.valueOf("FRONT"));
thissign.setWaxed(true);
s.setLine(0, Messages.getMessage(RealEstate.instance.config.cfgSignsHeader, false));
s.setLine(1, ChatColor.DARK_GREEN + RealEstate.instance.config.cfgReplaceSell);
s.setLine(2, owner != null ? Utils.getSignString(Bukkit.getOfflinePlayer(owner).getName()) : "SERVER");
@ -64,7 +68,7 @@ public class ClaimSell extends ClaimTransaction
s.setLine(3, price + " " + RealEstate.econ.currencyNamePlural());
}
}
s.update(true);
thissign.update(true);
}
else
{
@ -163,7 +167,8 @@ public class ClaimSell extends ClaimTransaction
else if(RealEstate.instance.config.cfgMailOffline && RealEstate.ess != null)
{
User u = RealEstate.ess.getUser(owner);
u.addMail(Messages.getMessage(RealEstate.instance.messages.msgInfoClaimOwnerSold,
u.sendMail(null, Messages.getMessage(RealEstate.instance.messages.msgInfoClaimOwnerSold,
player.getName(),
claimTypeDisplay,
RealEstate.econ.format(price),