Skip to content

Commit

Permalink
Version Change
Browse files Browse the repository at this point in the history
  • Loading branch information
@Driftay
Driftay committed Jan 19, 2024
1 parent fca12cf commit 99e606e
Show file tree
Hide file tree
Showing 20 changed files with 246 additions and 129 deletions.
25 changes: 6 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId>
<version>1.6.9.5-4.1.3-STABLE</version>
<version>1.6.9.5-4.1.4-STABLE</version>
<packaging>jar</packaging>

<name>SaberFactions</name>
Expand Down Expand Up @@ -77,7 +77,7 @@
<shadedPattern>com.massivecraft.factions.shade.com.darkblade12</shadedPattern>
</relocation>
<relocation>
<pattern>de.tr7zw</pattern>
<pattern>de.tr7zw.changeme.nbtapi</pattern>
<shadedPattern>com.massivecraft.factions.shade.nbtapi</shadedPattern>
</relocation>
</relocations>
Expand Down Expand Up @@ -107,20 +107,12 @@
<version>6c80848837</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xyz.xenondevs</groupId>
<artifactId>particle</artifactId>
<version>1.8.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api-plugin</artifactId>
<version>2.11.3</version>
<artifactId>item-nbt-api</artifactId>
<version>2.12.2</version>
<scope>compile</scope>
</dependency>


<dependency>
<groupId>me.lucko</groupId>
<artifactId>commodore</artifactId>
Expand All @@ -136,7 +128,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>9.4.0</version>
<version>9.8.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -250,7 +242,7 @@
<dependency>
<groupId>net.ess3</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.16.0</version>
<version>2.18.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -419,11 +411,6 @@
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
<layout>default</layout>
</repository>
<repository>
<id>central</id>
<name>bintray</name>
Expand Down
103 changes: 97 additions & 6 deletions src/main/java/com/massivecraft/factions/Conf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class Conf {
public static boolean factionOnlyChat = true;
// Configuration on the Faction tag in chat messages.
public static boolean chatTagEnabled = true;
public static transient boolean chatTagHandledByAnotherPlugin = false;
public static boolean chatTagHandledByAnotherPlugin = false;
public static boolean chatTagRelationColored = true;
public static List<String> blacklistedFactionNames = new ArrayList<>();
public static String allowedFactionNameCharacters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
Expand Down Expand Up @@ -281,10 +281,12 @@ public class Conf {

public static boolean enableClickToClaim = true;

//public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
//public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
// public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
public static boolean allowCreeperEggingChests = true;



// Economy settings
public static boolean econEnabled = false;
public static String econUniverseAccount = "";
Expand Down Expand Up @@ -513,14 +515,103 @@ public class Conf {
territoryDenyUsageMaterials.add(XMaterial.POWDER_SNOW_BUCKET.parseMaterial());
}

territoryDenySwitchMaterials.add(XMaterial.ACACIA_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_FENCE_GATE.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_DOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DISPENSER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.CHEST.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.TRAPPED_CHEST.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DROPPER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.HOPPER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ITEM_FRAME.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_TRAPDOOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LEVER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.COMPARATOR.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.REPEATER.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.PURPLE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.WHITE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.MAGENTA_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LIGHT_BLUE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.CYAN_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BLUE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BROWN_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.ORANGE_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.GREEN_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.RED_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BLACK_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.GRAY_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LIME_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.LIGHT_GRAY_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.PINK_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.YELLOW_SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.SHULKER_BOX.parseMaterial());
territoryDenySwitchMaterials.add(XMaterial.BARREL.parseMaterial());

//territoryCancelAndAllowItemUseMaterial.add(XMaterial.GOLDEN_APPLE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.APPLE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENCHANTED_GOLDEN_APPLE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_BEEF.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_MUTTON.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_CHICKEN.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_COD.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_PORKCHOP.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_RABBIT.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_SALMON.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENDER_PEARL.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.POTION.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.SPLASH_POTION.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.CREEPER_SPAWN_EGG.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.BOW.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_HELMET.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_CHESTPLATE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_LEGGINGS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_BOOTS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_HELMET.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_CHESTPLATE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_LEGGINGS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_BOOTS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_HELMET.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_CHESTPLATE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_LEGGINGS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_BOOTS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_HELMET.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_CHESTPLATE.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_LEGGINGS.parseMaterial());
//territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_BOOTS.parseMaterial());

/// TODO: Consider removing this in a future release, as permissions works just fine now
territoryProtectedMaterials.add(Material.BEACON);

// Config is not loading if value is empty ???
territoryBypassProtectedMaterials.add(Material.COOKIE);
territoryBypassProtectedMaterials.add(Material.CHEST);
territoryBypassProtectedMaterials.add(Material.TRAPPED_CHEST);
territoryBypassProtectedMaterials.add(XMaterial.COOKIE.parseMaterial());
territoryBypassProtectedMaterials.add(XMaterial.CHEST.parseMaterial());
territoryBypassProtectedMaterials.add(XMaterial.TRAPPED_CHEST.parseMaterial());


safeZoneNerfedCreatureTypes.add(EntityType.BLAZE);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/massivecraft/factions/Faction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public interface Faction extends EconomyParticipator {

void setWarpsLimit(int limit);

int getTntBankLimit();
long getTntBankLimit();

void setTntBankLimit(int limit);
void setTntBankLimit(long limit);

int getWallCheckMinutes();

Expand Down Expand Up @@ -192,9 +192,9 @@ public interface Faction extends EconomyParticipator {

ItemStack getBanner();

int getTnt();
long getTnt();

void setTnt(int amount);
void setTnt(long amount);

String getRule(int index);

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/massivecraft/factions/FactionsPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.massivecraft.factions.cmd.chest.AntiChestListener;
import com.massivecraft.factions.cmd.reserve.ReserveAdapter;
import com.massivecraft.factions.cmd.reserve.ReserveObject;
import com.massivecraft.factions.data.helpers.FactionDataHelper;
import com.massivecraft.factions.integration.LunarClientWrapper;
import com.massivecraft.factions.listeners.*;
import com.massivecraft.factions.listeners.vspecific.ChorusFruitListener;
Expand Down Expand Up @@ -187,6 +188,7 @@ public void onEnable() {
Bukkit.getPluginManager().registerEvents(new ChorusFruitListener(), this);
}

FactionDataHelper.init();

if (version > 8) {
Bukkit.getPluginManager().registerEvents(new MissionHandlerModern(), this);
Expand Down Expand Up @@ -227,7 +229,7 @@ public void onEnable() {
if (FactionsPlugin.getInstance().getConfig().getBoolean("fbanners.Enabled")) {
bannerManager = new BannerManager();
bannerManager.onEnable(this);
getServer().getPluginManager().registerEvents(new BannerListener(), this);
//getServer().getPluginManager().registerEvents(new BannerListener(), this);
}

this.getCommand(refCommand).setExecutor(cmdBase);
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import xyz.xenondevs.particle.ParticleBuilder;
import xyz.xenondevs.particle.ParticleEffect;

import java.awt.*;
import java.util.HashMap;
Expand All @@ -25,8 +23,8 @@ public class CmdSeeChunk extends FCommand {
//Used a hashmap cuz imma make a particle selection gui later, will store it where the boolean is rn.
public static HashMap<String, Boolean> seeChunkMap = new HashMap<>();
Long interval;
private boolean useParticles;
private final ParticleEffect effect = ParticleEffect.REDSTONE;
//private boolean useParticles;
//private final ParticleEffect effect = ParticleEffect.REDSTONE;

private int taskID = -1;

Expand All @@ -48,7 +46,7 @@ public CmdSeeChunk() {

aliases.addAll(Aliases.seeChunk);

this.useParticles = FactionsPlugin.getInstance().getConfig().getBoolean("see-chunk.particles", true);
//this.useParticles = FactionsPlugin.getInstance().getConfig().getBoolean("see-chunk.particles", true);
interval = FactionsPlugin.getInstance().getConfig().getLong("see-chunk.interval", 10L);

this.requirements = new CommandRequirements.Builder(Permission.SEECHUNK)
Expand Down Expand Up @@ -122,11 +120,11 @@ private void showPillar(Player player, World world, int blockX, int blockZ) {
if (block.getType() != Material.AIR) {
continue;
}
if (useParticles) {
new ParticleBuilder(this.effect, block.getLocation().add(0.5, 0, 0.5)).setColor(Color.RED).display(player);
} else {
//if (useParticles) {
// new ParticleBuilder(this.effect, block.getLocation().add(0.5, 0, 0.5)).setColor(Color.RED).display(player);
//} else {
VisualizeUtil.addLocation(player, block.getLocation(), y % 5 == 0 ? this.redstoneLamp : this.blackStainedGlass);
}
// }
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ public void onPlayerClickInventory(InventoryClickEvent event) {

if (event.getView().getTitle().equalsIgnoreCase(CC.translate(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))) && !event.getClick().isShiftClick()) {
if (currentItemType != Material.AIR) {
if (factionChestInventory == null || !factionChestInventory.contains(currentItem)) {
event.setCancelled(true);
if ((factionChestInventory == null || !factionChestInventory.contains(currentItem)) && clickedInventory == factionChestInventory) { event.setCancelled(true);
player.sendMessage(CC.RedB + "(!) That item no longer exists!");
Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didn't contain! Items: " + (factionChestInventory == null ? "none" : Arrays.toString(factionChestInventory.getContents())));
player.closeInventory();
Expand Down
Loading

0 comments on commit 99e606e

Please sign in to comment.