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 @@ -20,9 +20,9 @@ jobs:
cache: maven

- 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: Set dated development version
id: dev
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 @@ -41,9 +41,9 @@ jobs:
java-version: ${{ inputs.java-version }}

- 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: Validate release version
env:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

<groupId>net.tfminecraft</groupId>
<artifactId>geiger_counter</artifactId>
<version>1.1.3</version>
<version>2.0.0</version>

<name>geiger_counter</name>
<url>tfminecraft.net</url>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tlibs.version>1.1.1</tlibs.version>
<tlibs.version>2.0.0</tlibs.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -114,7 +114,7 @@
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>tfmc.justin.bstats</shadedPattern>
<shadedPattern>net.tfminecraft.geigercounters.bstats</shadedPattern>
</relocation>
</relocations>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.commands;
package net.tfminecraft.geigercounters.commands;

import org.bukkit.Bukkit;
import org.bukkit.Location;
Expand All @@ -8,10 +8,10 @@
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import tfmc.justin.config.GeigerConfiguration;
import tfmc.justin.config.Messages;
import tfmc.justin.managers.GeigerManager;
import tfmc.justin.utils.Utils;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.config.Messages;
import net.tfminecraft.geigercounters.managers.GeigerManager;
import net.tfminecraft.geigercounters.utils.Utils;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.config;
package net.tfminecraft.geigercounters.config;

import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package tfmc.justin.config;
package net.tfminecraft.geigercounters.config;

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.models.ItemReward;
import tfmc.justin.models.TierReward;
import tfmc.justin.utils.Utils;
import net.tfminecraft.geigercounters.models.ItemReward;
import net.tfminecraft.geigercounters.models.TierReward;
import net.tfminecraft.geigercounters.utils.Utils;

import java.io.File;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package tfmc.justin.config;
package net.tfminecraft.geigercounters.config;

import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.utils.Utils;
import net.tfminecraft.geigercounters.utils.Utils;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.events;
package net.tfminecraft.geigercounters.events;

import org.bukkit.Location;
import org.bukkit.entity.Player;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package tfmc.justin;
package net.tfminecraft.geigercounters;

import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
import org.bstats.charts.SingleLineChart;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.commands.GeigerCommand;
import tfmc.justin.config.ConfigMigrator;
import tfmc.justin.config.GeigerConfiguration;
import tfmc.justin.metrics.UsageStats;
import tfmc.justin.managers.GeigerManager;
import net.tfminecraft.geigercounters.commands.GeigerCommand;
import net.tfminecraft.geigercounters.config.ConfigMigrator;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.metrics.UsageStats;
import net.tfminecraft.geigercounters.managers.GeigerManager;

public class geiger_counter extends JavaPlugin {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tfmc.justin.handlers;
package net.tfminecraft.geigercounters.handlers;

import org.bukkit.Bukkit;
import org.bukkit.SoundCategory;
import org.bukkit.entity.Player;
import tfmc.justin.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;

import java.util.HashMap;
import java.util.Iterator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package tfmc.justin.handlers;
package net.tfminecraft.geigercounters.handlers;

import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.entity.Player;
import tfmc.justin.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;

// ====================================
// Handles rendering particle effects for the Geiger Counter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package tfmc.justin.handlers;
package net.tfminecraft.geigercounters.handlers;

import me.Plugins.TLibs.Objects.API.ItemAPI;
import net.tfminecraft.tlibs.objects.api.ItemAPI;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
Expand All @@ -9,14 +9,14 @@
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.config.GeigerConfiguration;
import tfmc.justin.events.GeigerSourceCollectEvent;
import tfmc.justin.managers.DropLimitManager;
import tfmc.justin.metrics.UsageStats;
import tfmc.justin.models.ItemReward;
import tfmc.justin.models.TierReward;
import tfmc.justin.utils.Utils;
import tfmc.justin.validators.SpawnLocationFilter;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.events.GeigerSourceCollectEvent;
import net.tfminecraft.geigercounters.managers.DropLimitManager;
import net.tfminecraft.geigercounters.metrics.UsageStats;
import net.tfminecraft.geigercounters.models.ItemReward;
import net.tfminecraft.geigercounters.models.TierReward;
import net.tfminecraft.geigercounters.utils.Utils;
import net.tfminecraft.geigercounters.validators.SpawnLocationFilter;

import java.util.HashMap;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.hooks;
package net.tfminecraft.geigercounters.hooks;

import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.math.BlockVector3;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package tfmc.justin.managers;
package net.tfminecraft.geigercounters.managers;

import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package tfmc.justin.managers;
package net.tfminecraft.geigercounters.managers;

import me.Plugins.TLibs.Enums.APIType;
import me.Plugins.TLibs.Objects.API.ItemAPI;
import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.enums.APIType;
import net.tfminecraft.tlibs.objects.api.ItemAPI;
import net.tfminecraft.tlibs.TLibs;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.config.GeigerConfiguration;
import tfmc.justin.handlers.GeigerClickPlayer;
import tfmc.justin.handlers.ParticleRenderer;
import tfmc.justin.handlers.SourceHandler;
import tfmc.justin.validators.GeigerValidator;
import tfmc.justin.validators.SpawnLocationFilter;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.handlers.GeigerClickPlayer;
import net.tfminecraft.geigercounters.handlers.ParticleRenderer;
import net.tfminecraft.geigercounters.handlers.SourceHandler;
import net.tfminecraft.geigercounters.validators.GeigerValidator;
import net.tfminecraft.geigercounters.validators.SpawnLocationFilter;

// ====================================
// Main manager for the Geiger Counter system
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.metrics;
package net.tfminecraft.geigercounters.metrics;

import java.util.concurrent.atomic.AtomicInteger;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.models;
package net.tfminecraft.geigercounters.models;

public class ItemReward {
private final String outputItem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.models;
package net.tfminecraft.geigercounters.models;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tfmc.justin.utils;
package net.tfminecraft.geigercounters.utils;

import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package tfmc.justin.validators;
package net.tfminecraft.geigercounters.validators;

import me.Plugins.TLibs.Objects.API.ItemAPI;
import net.tfminecraft.tlibs.objects.api.ItemAPI;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package tfmc.justin.validators;
package net.tfminecraft.geigercounters.validators;

import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.plugin.java.JavaPlugin;
import tfmc.justin.config.GeigerConfiguration;
import tfmc.justin.hooks.WorldGuardHook;
import net.tfminecraft.geigercounters.config.GeigerConfiguration;
import net.tfminecraft.geigercounters.hooks.WorldGuardHook;

// ====================================
// Decides whether a candidate source location is allowed to be used
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
main: tfmc.justin.geiger_counter
main: net.tfminecraft.geigercounters.geiger_counter
version: ${project.version}
name: geiger_counter
author: Justin
Expand Down