Skip to content

Commit

Permalink
Release change
Browse files Browse the repository at this point in the history
  • Loading branch information
Shynixn authored Jan 29, 2017
2 parents 9997a4c + 0b21b94 commit bde70f2
Show file tree
Hide file tree
Showing 75 changed files with 2,165 additions and 1,975 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<description>Spigot plugin to simulate a football/soccer game in minecraft.</description>
<url>https://github.com/Shynixn/BlockBall</url>
<packaging>jar</packaging>
<version>3.7.0</version>
<version>3.8.0</version>

<developers>
<developer>
Expand All @@ -31,7 +31,7 @@

<build>
<plugins>
<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
Expand Down
12 changes: 4 additions & 8 deletions src/main/java/com/github/shynixn/blockball/api/BlockBallApi.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.github.shynixn.blockball.api;

import com.github.shynixn.blockball.business.logic.game.GameController;
import com.github.shynixn.blockball.lib.SPluginLoader;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.plugin.java.JavaPlugin;

import com.github.shynixn.blockball.api.entities.Arena;
import com.github.shynixn.blockball.api.entities.Ball;
import com.github.shynixn.blockball.business.bukkit.nms.NMSRegistry;
import com.github.shynixn.blockball.business.logic.ball.BallController;
import org.bukkit.util.Vector;
import com.github.shynixn.blockball.business.logic.game.GameController;
import com.github.shynixn.blockball.lib.SPluginLoader;
import org.bukkit.World;
import org.bukkit.plugin.java.JavaPlugin;

/**
* API to access BlockBall games.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ public interface LobbyMeta extends ConfigurationSerializable {

int getCountDown();

String getGamesubTitleMessage();
String getGameSubTitleMessage();

void setGamesubTitleMessage(String gamesubTitleMessage);
void setGameSubTitleMessage(String gamesubTitleMessage);

String getGameTitleMessage();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,12 @@ public interface TeamMeta extends ConfigurationSerializable {
LightBossBar getBossBar();

LightScoreboard getScoreboard();

void setGoalShooterGlowing(boolean enable);

boolean isGoalShooterGlowing();

void setGoalShooterGlowingSeconds(int seconds);

int getGoalShooterGlowingSeconds();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* API to manage boost items of the arena
*
* @since 2.9
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.api.entities.items;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* API to manage most of the used items in the logic.
*
* @since 1.0
* @author Shynixn
* @version 1.5
*/
package com.github.shynixn.blockball.api.entities;
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* Created by Shynixn
*/
public class GoalShootEvent extends SEvent {
private Game game;
private Player player;
private Team team;
private final Game game;
private final Player player;
private final Team team;

public GoalShootEvent(Game game, Player player, Team team) {
this.game = game;
Expand All @@ -20,14 +20,14 @@ public GoalShootEvent(Game game, Player player, Team team) {
}

public Game getGame() {
return game;
return this.game;
}

public Player getPlayer() {
return player;
return this.player;
}

public Team getTeam() {
return team;
return this.team;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
public class PlaceHolderRequestEvent extends SEvent {
private String result;
private Player player;
private PlaceHolderType type;
private int game;
private final Player player;
private final PlaceHolderType type;
private final int game;

public PlaceHolderRequestEvent(Player player,PlaceHolderType type, int game) {
this.player = player;
Expand All @@ -20,19 +20,19 @@ public PlaceHolderRequestEvent(Player player,PlaceHolderType type, int game) {
}

public Player getPlayer() {
return player;
return this.player;
}

public int getGame() {
return game;
return this.game;
}

public PlaceHolderType getType() {
return type;
return this.type;
}

public String getResult() {
return result;
return this.result;
}

public void setResult(String result) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* API to manage events from the BlockBall logic.
*
* @since 1.0
* @author Shynixn
* @version 2.1
*/
package com.github.shynixn.blockball.api.events;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* API location to provide useful interactions.
*
* @since 1.0
* @author Shynixn
* @version 2.1
*/
package com.github.shynixn.blockball.api;
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.github.shynixn.blockball.lib.SLocation;
import com.github.shynixn.blockball.lib.SPluginLoader.PluginLoader;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.block.Sign;
Expand All @@ -18,6 +19,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;

public final class Config {
@PluginLoader
Expand Down Expand Up @@ -96,9 +98,9 @@ public void reload() {

this.particleVisibleForAll = this.c.getBoolean("particles.visible-for-all");
this.particlePermission = this.c.getString("particles.visible-permission");
} catch (Exception ex) {
ex.printStackTrace();
} catch (final Exception ex) {
SConsoleUtils.sendColoredMessage("Please delete your config file to fix this problem.", ChatColor.GREEN, BlockBallPlugin.PREFIX_CONSOLE);
Bukkit.getLogger().log(Level.WARNING, "Cannot setup config." , ex);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Provides access to the plugin BossBar
*
* @since 2.5
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.business.bukkit.dependencies.bossbar;
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public String onPlaceholderRequest(Player player, String s) {
return "";
try {
if (PlaceHolderType.getTypeFromName(s) != null) {
PlaceHolderRequestEvent event;
final PlaceHolderRequestEvent event;
if (s.split("_")[0].equals("player")) {
event = new PlaceHolderRequestEvent(player, PlaceHolderType.getTypeFromName(s), -1);
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Provides access to the plugin WorldGuard
*
* @since 2.5
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.business.bukkit.dependencies.placeholderapi;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Provides access to the plugin BossBar
*
* @since 2.5
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.business.bukkit.dependencies.vault;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Provides access to the plugin BossBar
*
* @since 2.5
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.business.bukkit.dependencies.worldguard;
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;

import java.util.logging.Level;

public final class NMSRegistry {
private NMSRegistry() {
super();
Expand All @@ -41,8 +43,8 @@ public static void accessWorldGuardSpawn(Location location) {
WorldGuardConnection6.allowSpawn(location, getWorldGuard());
else if (RegisterHelper.isRegistered("WorldGuard", '5'))
WorldGuardConnection5.allowSpawn(location, getWorldGuard());
} catch (Exception e) {
e.printStackTrace();
} catch (final Exception e) {
Bukkit.getLogger().log(Level.WARNING, "Cannot access worldguard.", e);
}
}
}
Expand All @@ -67,8 +69,8 @@ public static void rollbackWorldGuardSpawn(Location location) {
WorldGuardConnection6.rollBack();
else if (RegisterHelper.isRegistered("WorldGuard", '5'))
WorldGuardConnection5.rollBack();
} catch (Exception e) {
e.printStackTrace();
} catch (final Exception e) {
Bukkit.getLogger().log(Level.WARNING, "Cannot access worldguard.", e);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Redirects NMS requests over the NMSRegistry
*
* @since 1.0
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.business.bukkit.nms;
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
spigotTimings(false);
}

@Override
public void recalcPosition() {
AxisAlignedBB axisalignedbb = this.getBoundingBox();
this.locX = (axisalignedbb.a + axisalignedbb.d) / 2.0D;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Main plugin level.
*
* @since 1.0
* @author Shynixn
* @version 1.0
*/
package com.github.shynixn.blockball.business.bukkit;
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.logging.Level;

/**
* Created by Shynixn
Expand Down Expand Up @@ -48,8 +49,8 @@ private void registerDynamicCommand(String command, BukkitCommand clazz) {
Object instance = subclazz.cast(Bukkit.getServer());
instance = BungeeCord.invokeMethodByObject(instance, "getCommandMap");
ReflectionLib.invokeMethodByObject(instance, "register", command, clazz);
} catch (Exception ex) {
ex.printStackTrace();
} catch (final Exception ex) {
Bukkit.getLogger().log(Level.WARNING, "Cannot register dynamic command.", ex);
}
}
}
Loading

0 comments on commit bde70f2

Please sign in to comment.