Upstream/AcidIsland
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/AcidIsland.git synced 2024-11-21 18:15:51 +01:00
Code Issues Projects Releases Wiki Activity

Use latest Bentobox

Browse Source
This commit is contained in:
tastybento 2018-08-01 16:18:27 -07:00
parent 046ac2e311
commit 1fea0f5964
14 changed files with 59 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -63,7 +63,7 @@
<dependency>
<groupId>world.bentobox</groupId>
<artifactId>bentobox</artifactId>
<version>1.0</version>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>

22
src/main/java/bentobox/addon/acidisland/AISettings.java
View File

@ -14,17 +14,17 @@ import org.bukkit.GameMode;
import org.bukkit.entity.EntityType;
import org.bukkit.potion.PotionEffectType;
import world.bentobox.bbox.api.addons.Addon;
import world.bentobox.bbox.api.configuration.ConfigComment;
import world.bentobox.bbox.api.configuration.ConfigEntry;
import world.bentobox.bbox.api.configuration.StoreAt;
import world.bentobox.bbox.api.configuration.WorldSettings;
import world.bentobox.bbox.api.flags.Flag;
import world.bentobox.bbox.database.objects.DataObject;
import world.bentobox.bbox.database.objects.adapters.Adapter;
import world.bentobox.bbox.database.objects.adapters.FlagSerializer;
import world.bentobox.bbox.database.objects.adapters.FlagSerializer2;
import world.bentobox.bbox.database.objects.adapters.PotionEffectListAdapter;
import world.bentobox.bentobox.api.addons.Addon;
import world.bentobox.bentobox.api.configuration.ConfigComment;
import world.bentobox.bentobox.api.configuration.ConfigEntry;
import world.bentobox.bentobox.api.configuration.StoreAt;
import world.bentobox.bentobox.api.configuration.WorldSettings;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.database.objects.DataObject;
import world.bentobox.bentobox.database.objects.adapters.Adapter;
import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
import world.bentobox.bentobox.database.objects.adapters.PotionEffectListAdapter;
/**
* A lot of placeholders right now in here...

4
src/main/java/bentobox/addon/acidisland/AcidIsland.java
View File

@ -9,8 +9,8 @@ import bentobox.addon.acidisland.listeners.AcidEffect;
import bentobox.addon.acidisland.listeners.LavaCheck;
import bentobox.addon.acidisland.world.AcidIslandWorld;
import bentobox.addon.acidisland.world.AcidTask;
import world.bentobox.bbox.api.addons.Addon;
import world.bentobox.bbox.api.configuration.BSBConfig;
import world.bentobox.bentobox.api.addons.Addon;
import world.bentobox.bentobox.api.configuration.BSBConfig;
/**
* Addon to BSkyBlock that enables AcidIsland

38
src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java
View File

@ -3,25 +3,25 @@ package bentobox.addon.acidisland.commands;
import java.util.List;
import bentobox.addon.acidisland.AcidIsland;
import world.bentobox.bbox.api.addons.Addon;
import world.bentobox.bbox.api.commands.CompositeCommand;
import world.bentobox.bbox.api.user.User;
import world.bentobox.bbox.commands.admin.AdminClearResetsAllCommand;
import world.bentobox.bbox.commands.admin.AdminClearResetsCommand;
import world.bentobox.bbox.commands.admin.AdminGetRankCommand;
import world.bentobox.bbox.commands.admin.AdminInfoCommand;
import world.bentobox.bbox.commands.admin.AdminRegisterCommand;
import world.bentobox.bbox.commands.admin.AdminReloadCommand;
import world.bentobox.bbox.commands.admin.AdminSchemCommand;
import world.bentobox.bbox.commands.admin.AdminSetRankCommand;
import world.bentobox.bbox.commands.admin.AdminTeleportCommand;
import world.bentobox.bbox.commands.admin.AdminUnregisterCommand;
import world.bentobox.bbox.commands.admin.AdminVersionCommand;
import world.bentobox.bbox.commands.admin.range.AdminRangeCommand;
import world.bentobox.bbox.commands.admin.team.AdminTeamAddCommand;
import world.bentobox.bbox.commands.admin.team.AdminTeamDisbandCommand;
import world.bentobox.bbox.commands.admin.team.AdminTeamKickCommand;
import world.bentobox.bbox.commands.admin.team.AdminTeamMakeLeaderCommand;
import world.bentobox.bentobox.api.addons.Addon;
import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.commands.admin.AdminClearResetsAllCommand;
import world.bentobox.bentobox.commands.admin.AdminClearResetsCommand;
import world.bentobox.bentobox.commands.admin.AdminGetRankCommand;
import world.bentobox.bentobox.commands.admin.AdminInfoCommand;
import world.bentobox.bentobox.commands.admin.AdminRegisterCommand;
import world.bentobox.bentobox.commands.admin.AdminReloadCommand;
import world.bentobox.bentobox.commands.admin.AdminSchemCommand;
import world.bentobox.bentobox.commands.admin.AdminSetRankCommand;
import world.bentobox.bentobox.commands.admin.AdminTeleportCommand;
import world.bentobox.bentobox.commands.admin.AdminUnregisterCommand;
import world.bentobox.bentobox.commands.admin.AdminVersionCommand;
import world.bentobox.bentobox.commands.admin.range.AdminRangeCommand;
import world.bentobox.bentobox.commands.admin.team.AdminTeamAddCommand;
import world.bentobox.bentobox.commands.admin.team.AdminTeamDisbandCommand;
import world.bentobox.bentobox.commands.admin.team.AdminTeamKickCommand;
import world.bentobox.bentobox.commands.admin.team.AdminTeamMakeLeaderCommand;
public class AcidCommand extends CompositeCommand {

32
src/main/java/bentobox/addon/acidisland/commands/AiCommand.java
View File

@ -4,22 +4,22 @@ import java.util.ArrayList;
import java.util.List;
import bentobox.addon.acidisland.AcidIsland;
import world.bentobox.bbox.api.addons.Addon;
import world.bentobox.bbox.api.commands.CompositeCommand;
import world.bentobox.bbox.api.user.User;
import world.bentobox.bbox.commands.island.IslandAboutCommand;
import world.bentobox.bbox.commands.island.IslandBanCommand;
import world.bentobox.bbox.commands.island.IslandBanlistCommand;
import world.bentobox.bbox.commands.island.IslandCreateCommand;
import world.bentobox.bbox.commands.island.IslandGoCommand;
import world.bentobox.bbox.commands.island.IslandLanguageCommand;
import world.bentobox.bbox.commands.island.IslandResetCommand;
import world.bentobox.bbox.commands.island.IslandResetnameCommand;
import world.bentobox.bbox.commands.island.IslandSethomeCommand;
import world.bentobox.bbox.commands.island.IslandSetnameCommand;
import world.bentobox.bbox.commands.island.IslandSettingsCommand;
import world.bentobox.bbox.commands.island.IslandUnbanCommand;
import world.bentobox.bbox.commands.island.team.IslandTeamCommand;
import world.bentobox.bentobox.api.addons.Addon;
import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.commands.island.IslandAboutCommand;
import world.bentobox.bentobox.commands.island.IslandBanCommand;
import world.bentobox.bentobox.commands.island.IslandBanlistCommand;
import world.bentobox.bentobox.commands.island.IslandCreateCommand;
import world.bentobox.bentobox.commands.island.IslandGoCommand;
import world.bentobox.bentobox.commands.island.IslandLanguageCommand;
import world.bentobox.bentobox.commands.island.IslandResetCommand;
import world.bentobox.bentobox.commands.island.IslandResetnameCommand;
import world.bentobox.bentobox.commands.island.IslandSethomeCommand;
import world.bentobox.bentobox.commands.island.IslandSetnameCommand;
import world.bentobox.bentobox.commands.island.IslandSettingsCommand;
import world.bentobox.bentobox.commands.island.IslandUnbanCommand;
import world.bentobox.bentobox.commands.island.team.IslandTeamCommand;
public class AiCommand extends CompositeCommand {

4
src/main/java/bentobox/addon/acidisland/events/EntityDamageByAcidEvent.java
View File

@ -2,8 +2,8 @@ package bentobox.addon.acidisland.events;
import org.bukkit.entity.Entity;
import world.bentobox.bbox.api.events.IslandBaseEvent;
import world.bentobox.bbox.database.objects.Island;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.database.objects.Island;
/**
* Fired when an entity (items excluded) receives damage from acid

4
src/main/java/bentobox/addon/acidisland/events/ItemDestroyByAcidEvent.java
View File

@ -2,8 +2,8 @@ package bentobox.addon.acidisland.events;
import org.bukkit.entity.Item;
import world.bentobox.bbox.api.events.IslandBaseEvent;
import world.bentobox.bbox.database.objects.Island;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.database.objects.Island;
/**
* Fired when an item (on the ground) gets destroyed by acid

4
src/main/java/bentobox/addon/acidisland/events/ItemFillWithAcidEvent.java
View File

@ -3,8 +3,8 @@ package bentobox.addon.acidisland.events;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import world.bentobox.bbox.api.events.IslandBaseEvent;
import world.bentobox.bbox.database.objects.Island;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.database.objects.Island;
/**
* Fired when an ItemStack (water bottle or bucket) is filled with acid

4
src/main/java/bentobox/addon/acidisland/events/PlayerDrinkAcidEvent.java
View File

@ -2,8 +2,8 @@ package bentobox.addon.acidisland.events;
import org.bukkit.entity.Player;
import world.bentobox.bbox.api.events.IslandBaseEvent;
import world.bentobox.bbox.database.objects.Island;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.database.objects.Island;
/**
* Fired when a player drinks acid and... DIES

2
src/main/java/bentobox/addon/acidisland/listeners/AcidEffect.java
View File

@ -30,7 +30,7 @@ import bentobox.addon.acidisland.AcidIsland;
import bentobox.addon.acidisland.events.AcidEvent;
import bentobox.addon.acidisland.events.AcidRainEvent;
import bentobox.addon.acidisland.world.AcidTask;
import world.bentobox.bbox.util.Util;
import world.bentobox.bentobox.util.Util;
/**
* Applies the acid effect to players

2
src/main/java/bentobox/addon/acidisland/world/AcidIslandWorld.java
View File

@ -6,7 +6,7 @@ import org.bukkit.WorldCreator;
import org.bukkit.WorldType;
import bentobox.addon.acidisland.AcidIsland;
import world.bentobox.bbox.util.Util;
import world.bentobox.bentobox.util.Util;
/**
* Creates the AI worlds and registers them with BSkyBlock

2
src/test/java/bentobox/addon/acidisland/events/AcidEventTest.java
View File

@ -16,8 +16,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import bentobox.addon.acidisland.events.AcidEvent;
public class AcidEventTest {
private Player player;

2
src/test/java/bentobox/addon/acidisland/events/AcidRainEventTest.java
View File

@ -10,8 +10,6 @@ import org.bukkit.entity.Player;
import org.junit.Before;
import org.junit.Test;
import bentobox.addon.acidisland.events.AcidRainEvent;
public class AcidRainEventTest {
private Player player;

1
src/test/java/bentobox/addon/acidisland/world/AcidTaskTest.java
View File

@ -15,7 +15,6 @@ import org.powermock.modules.junit4.PowerMockRunner;
import bentobox.addon.acidisland.AISettings;
import bentobox.addon.acidisland.AcidIsland;
import bentobox.addon.acidisland.world.AcidTask;
@RunWith(PowerMockRunner.class)
@PrepareForTest({Bukkit.class})