JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2014-08-15 23:19:13 -05:00
commit 249a56360e
10 changed files with 88 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml
View File

@ -1,10 +1,21 @@
<component name="ArtifactManager">
<artifact name="Nautilus.Game.Arcade:test">
<output-path>$PROJECT_DIR$/../Testing/Arcade</output-path>
<root id="root">
<element id="directory" name="plugins">
<element id="artifact" artifact-name="Nautilus.Game.Arcade:jar" />
</element>
<artifact type="jar" build-on-make="true" name="Nautilus.Game.Arcade:test">
<output-path>$PROJECT_DIR$/../Testing/Arcade/plugins</output-path>
<root id="archive" name="Arcade.jar">
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-codec-1.6.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-logging-1.1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-pool2-2.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpclient-4.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpcore-4.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jedis-2.4.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
<element id="module-output" name="Mineplex.Core" />
<element id="module-output" name="Mineplex.Core.Common" />
<element id="module-output" name="Mineplex.Minecraft.Game.ClassCombat" />
<element id="module-output" name="Mineplex.Minecraft.Game.Core" />
<element id="module-output" name="Mineplex.ServerData" />
<element id="module-output" name="Nautilus.Game.Arcade" />
<element id="file-copy" path="$PROJECT_DIR$/Nautilus.Game.Arcade/plugin.yml" />
</root>
</artifact>
</component>

3
Plugins/.idea/compiler.xml
View File

@ -19,5 +19,8 @@
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="GENERATE_NO_WARNINGS" value="true" />
</component>
</project>

6
Plugins/.idea/misc.xml
View File

@ -2,8 +2,12 @@
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
<list size="1">
<item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
</list>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="IdProvider" IDEtalkID="7E81636CD93857493DFE224533ECF492" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

2
Plugins/.idea/runConfigurations/Arcade.xml
View File

@ -17,7 +17,9 @@
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="Nautilus.Game.Arcade:test" />

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java
View File

@ -15,7 +15,7 @@ public class MotdRepository
private static String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS BungeeMotd (id INT NOT NULL AUTO_INCREMENT, motd VARCHAR(256), PRIMARY KEY (id));";
private static String RETRIEVE_MOTD = "SELECT motd FROM BungeeMotd;";
public void initialize()
{
PreparedStatement preparedStatement = null;

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
View File

@ -7,6 +7,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.InputStreamReader;
import java.util.*;
import mineplex.core.account.CoreClientManager;
import mineplex.core.antihack.AntiHack;
@ -14,8 +15,7 @@ import mineplex.core.antistack.AntiStack;
import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.blood.Blood;
import mineplex.core.command.CommandCenter;
import mineplex.core.common.util.FileUtil;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.*;
import mineplex.core.cosmetic.CosmeticManager;
import mineplex.core.creature.Creature;
import mineplex.core.disguise.DisguiseManager;
@ -44,7 +44,8 @@ import mineplex.minecraft.game.core.combat.CombatManager;
import mineplex.minecraft.game.core.damage.DamageManager;
import nautilus.game.arcade.game.GameServerConfig;
import org.bukkit.entity.Player;
import net.minecraft.server.v1_7_R4.*;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
public class Arcade extends JavaPlugin
@ -61,18 +62,22 @@ public class Arcade extends JavaPlugin
@Override
public void onEnable()
{
//Delete Old Games Folders
//Delete Old Games Folders
DeleteFolders();
//Configs
//Configs
getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/");
getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG));
saveConfig();
String webServerAddress = getConfig().getString(WEB_CONFIG);
int andthecatisdog = 0;
andthecatisdog += andthecatisdog;
andthecatisdog = 5;
Logger.initialize(this);
//Static Modules
CommandCenter.Initialize(this);
_clientManager = new CoreClientManager(this, webServerAddress);

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -75,7 +75,6 @@ public class Bridge extends TeamGame implements OreObsfucation
private ArrayList<Location> _lavaBridge = new ArrayList<Location>();
private ArrayList<Location> _lavaSource = new ArrayList<Location>();
//Bridge Parts
private HashSet<BridgePart> _bridgeParts = new HashSet<BridgePart>();
//Animals

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java
View File

@ -296,14 +296,12 @@ public class Runner extends SoloGame implements IThrown
@Override
public void Idle(ProjectileUser data)
{
// TODO Auto-generated method stub
}
@Override
public void Expire(ProjectileUser data)
{
// TODO Auto-generated method stub
}
}

41
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitSnowballer.java Normal file
View File

@ -0,0 +1,41 @@
package nautilus.game.arcade.game.games.spleef.kits;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.*;
public class KitSnowballer extends Kit
{
public KitSnowballer(ArcadeManager manager)
{
super(manager, "Snowballer", KitAvailability.Free,
new String[]
{
"Throw snowballs to break blocks!",
"Receives 2 Snowball when you punch blocks!"
},
new Perk[]
{
new PerkKnockback(0.3)
},
EntityType.SKELETON,
new ItemStack(Material.SNOW_BALL));
}
@Override
public void GiveItems(Player player)
{
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.SNOW_BALL));
}
}

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSnowball.java Normal file
View File

@ -0,0 +1,6 @@
package nautilus.game.arcade.kit.perks;
public class PerkSnowball
{
}