Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
distribution: temurin
java-version: '21'
- name: Install shared plugin dependencies
uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62
uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576
with:
mode: latest
mode: pinned

- name: Prepare pinned dependencies
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ jobs:
[[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1

- name: Install shared plugin dependencies
uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62
uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576
with:
mode: latest
mode: pinned

- name: Prepare pinned dependencies
env:
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

<groupId>net.tfminecraft</groupId>
<artifactId>games</artifactId>
<version>0.1.1</version>
<version>0.2.0</version>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<denareconomy.version>0.1.9</denareconomy.version>
<rpcharacters.version>1.1.7</rpcharacters.version>
<simplefactions.version>2.8.7</simplefactions.version>
<tlibs.version>1.1.1</tlibs.version>
<denareconomy.version>0.2.0</denareconomy.version>
<rpcharacters.version>2.0.0</rpcharacters.version>
<simplefactions.version>3.0.0</simplefactions.version>
<tlibs.version>2.0.0</tlibs.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/Messages.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import me.Plugins.TLibs.Objects.API.SubAPI.StringFormatter;
import net.tfminecraft.tlibs.objects.api.subapi.StringFormatter;

/**
* Player-facing strings from messages.yml.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.Messages;
import net.tfminecraft.games.cache.Cache;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/gui/GameSelectGui.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataType;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.games.Messages;
import net.tfminecraft.games.cache.Cache;
import net.tfminecraft.games.table.TableManager;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/tfminecraft/games/guild/GuildTables.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;

import me.Plugins.SimpleFactions.Guild.Guild;
import me.Plugins.SimpleFactions.Managers.FactionManager;
import me.Plugins.SimpleFactions.Objects.Bank;
import me.Plugins.SimpleFactions.enums.GuildModifier;
import net.tfminecraft.simplefactions.guild.Guild;
import net.tfminecraft.simplefactions.managers.FactionManager;
import net.tfminecraft.simplefactions.objects.Bank;
import net.tfminecraft.simplefactions.enums.GuildModifier;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.Messages;
import net.tfminecraft.games.table.Table;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/help/HelpBook.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BookMeta;

import me.Plugins.TLibs.Objects.API.SubAPI.StringFormatter;
import net.tfminecraft.tlibs.objects.api.subapi.StringFormatter;

/**
* One book from help.yml. Pages are written by hand in the config rather than wrapped here,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/loader/CardLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import me.Plugins.TLibs.Interface.LoaderInterface;
import net.tfminecraft.tlibs.interfaces.LoaderInterface;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.card.Card;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import me.Plugins.TLibs.Interface.LoaderInterface;
import net.tfminecraft.tlibs.interfaces.LoaderInterface;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.cache.Cache;
import net.tfminecraft.games.wager.WagerItemOverride;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import me.Plugins.TLibs.Interface.LoaderInterface;
import net.tfminecraft.tlibs.interfaces.LoaderInterface;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.cache.Cache;
import net.tfminecraft.games.layout.TableLayout;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/loader/HelpLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import me.Plugins.TLibs.Interface.LoaderInterface;
import net.tfminecraft.tlibs.interfaces.LoaderInterface;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.cache.Cache;
import net.tfminecraft.games.help.HelpBook;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.Messages;
import net.tfminecraft.games.cache.Cache;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/voice/RpNames.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;

import net.tfminecraft.RPCharacters.identity.DisplayIdentityService;
import net.tfminecraft.rpcharacters.identity.DisplayIdentityService;
import net.tfminecraft.games.Games;

/**
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/tfminecraft/games/voice/RpVoice.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;

import net.tfminecraft.RPCharacters.Loaders.ChatLoader;
import net.tfminecraft.RPCharacters.Managers.PlayerManager;
import net.tfminecraft.RPCharacters.Objects.PlayerData;
import net.tfminecraft.RPCharacters.chat.ChatChannel;
import net.tfminecraft.RPCharacters.chat.ChatManager;
import net.tfminecraft.rpcharacters.loaders.ChatLoader;
import net.tfminecraft.rpcharacters.managers.PlayerManager;
import net.tfminecraft.rpcharacters.objects.PlayerData;
import net.tfminecraft.rpcharacters.chat.ChatChannel;
import net.tfminecraft.rpcharacters.chat.ChatManager;
import net.tfminecraft.games.Games;
import net.tfminecraft.games.layout.TableLayout;
import net.tfminecraft.games.layout.TableLayout.VoiceLines;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/tfminecraft/games/wager/ChipItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;

import net.tfminecraft.DenarEconomy.DenarEconomy;
import net.tfminecraft.DenarEconomy.Item.Coin;
import net.tfminecraft.denareconomy.DenarEconomy;
import net.tfminecraft.denareconomy.item.Coin;
import net.tfminecraft.games.cache.Cache;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/tfminecraft/games/wager/CitizenTax.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import org.bukkit.entity.Player;

import net.tfminecraft.DenarEconomy.DenarEconomy;
import net.tfminecraft.DenarEconomy.Loaders.MessageLoader;
import net.tfminecraft.denareconomy.DenarEconomy;
import net.tfminecraft.denareconomy.loaders.MessageLoader;

/**
* Citizen tax on net coin profit from a table round. Uses DenarEconomy {@code doTaxes} so
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/tfminecraft/games/wager/GuildBank.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;

import me.Plugins.SimpleFactions.Guild.Guild;
import me.Plugins.SimpleFactions.Managers.FactionManager;
import me.Plugins.SimpleFactions.Objects.Bank;
import net.tfminecraft.simplefactions.guild.Guild;
import net.tfminecraft.simplefactions.managers.FactionManager;
import net.tfminecraft.simplefactions.objects.Bank;
import net.tfminecraft.games.Games;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;

/**
* Per-item look and optional denar value. Null value means /wager amount is required.
Expand Down
Loading