Compare commits

..

No commits in common. "master" and "AliBranch" have entirely different histories.

20 changed files with 47 additions and 356 deletions

8
.classpath Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="C:/Users/Elmar-Laptop/Personal/Hobbies/The Button Rebirth/Button Plugin/Minecraft Test Server/craftbukkit-1.9.2.jar"/>
<classpathentry kind="lib" path="C:/Users/Elmar-Laptop/Personal/Hobbies/The Button Rebirth/Button Plugin/Minecraft Test Server/spigot-1.9.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

224
.gitignore vendored
View file

@ -1,224 +0,0 @@
#################
## Eclipse
#################
*.pydevproject
.project
.metadata/
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath
target/
.project
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
.cproject
# PDT-specific
.buildpath
#################
## Visual Studio
#################
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.sln.docstates
# Build results
[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile
# Visual Studio profiler
*.psess
*.vsp
*.vspx
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# NCrunch
*.ncrunch*
.*crunch*.local.xml
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.Publish.xml
*.pubxml
*.publishproj
# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
# Windows Azure Build Output
csx
*.build.csdef
# Windows Store app package directory
AppPackages/
# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
#############
## Windows detritus
#############
# Windows image file caches
Thumbs.db
ehthumbs.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Mac crap
.DS_Store
#############
## Python
#############
*.py[cod]
# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg
# Installer logs
pip-log.txt
# Unit test / coverage reports
.coverage
.tox
#Translations
*.mo
#Mr Developer
.mr.developer.cfg
.metadata/*
TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar
*.iml
*.name
.idea/compiler.xml
*.xml

17
.project Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ButtonLaboratoryPlugin</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View file

@ -0,0 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7

Binary file not shown.

View file

@ -5,21 +5,19 @@ import java.util.logging.Logger;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
import buttondevteam.alisolarflare.discordbot.DiscordSubPlugin;
import buttondevteam.alisolarflare.iiewar.IieWarSubPlugin;
import buttondevteam.alisolarflare.aliarrowtrail.AliArrowListener;
public class MainPlugin extends JavaPlugin{
private PluginDescriptionFile pdfFile;
private Logger logger;
private DiscordSubPlugin discordSubPlugin;
private IieWarSubPlugin iieWarSubPlugin;
private AliArrowListener aliArrowListener;
public void onEnable(){
//Logs "Plugin Enabled", registers commands
pdfFile = getDescription();
logger = getLogger();
logger.info(pdfFile.getName() + " has been started (V." + pdfFile.getVersion()+ ").");
registerSubPlugins();
registerCommands();
registerEvents();
@ -28,17 +26,16 @@ public class MainPlugin extends JavaPlugin{
public void onDisable(){
logger.info(pdfFile.getName() + " has been Disabled (V." + pdfFile.getVersion()+ ").");
}
public void registerSubPlugins(){
discordSubPlugin = new DiscordSubPlugin(this);
iieWarSubPlugin = new IieWarSubPlugin(this);
discordSubPlugin.register();
iieWarSubPlugin.register();
}
public void registerCommands(){
//Example command: getCommand("createShrine").setExecutor(new CreateShrine(this));
}
public void registerEvents(){
//Example INIT: midnightListener = new MidnightListener(this);
//Example Event: getServer().getPluginManager().registerEvents(midnightListener, this);
//INIT
aliArrowListener = new AliArrowListener(this);
//EVENTS
getServer().getPluginManager().registerEvents(aliArrowListener, this);
}
}

View file

@ -1,26 +0,0 @@
package buttondevteam.alisolarflare.discordbot;
import java.util.logging.Level;
import buttondevteam.MainPlugin;
public class DiscordSubPlugin {
private MainPlugin plugin;
public DiscordSubPlugin(MainPlugin plugin){
this.plugin = plugin;
}
public void register(){
registerEvents();
registerCommands();
plugin.getLogger().log(Level.INFO, "Discord Sub Plugin Registered!");
}
private void registerEvents() {
}
private void registerCommands() {
// TODO Auto-generated method stub
}
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.discordbot.commands;
public class Discord {
}

View file

@ -1,16 +0,0 @@
package buttondevteam.alisolarflare.discordbot.helpers;
public class DiscordBotLink {
public void setRoleAsMinecraft(){
}
public void unsetRoleAsMinecraft(){
}
public void setRoleAsFlair(){
}
public void unsetRoleAsFlair(){
}
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.discordbot.listeners;
public class PrivateMessageListener {
}

View file

@ -1,25 +0,0 @@
package buttondevteam.alisolarflare.iiewar;
import java.util.logging.Level;
import buttondevteam.MainPlugin;
public class IieWarSubPlugin {
private MainPlugin plugin;
public IieWarSubPlugin(MainPlugin plugin){
this.plugin = plugin;
}
public void register(){
registerEvents();
registerCommands();
plugin.getLogger().log(Level.INFO, "Discord Sub Plugin Registered!");
}
private void registerEvents() {
}
private void registerCommands() {
// TODO Auto-generated method stub
}
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.iiewar.commands;
public class ToggleWar {
}

View file

@ -1,16 +0,0 @@
package buttondevteam.alisolarflare.iiewar.helpers;
import org.bukkit.entity.Player;
public class WarListManager {
public void createWarList(){
//stub
}
public void LoadWarList(){
//stub
}
public boolean isOnList(Player player){
return false;
//stub
}
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.iiewar.listeners;
public class CreativeListener {
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.iiewar.listeners;
public class ObsidianListener {
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.iiewar.listeners;
public class SpawnEggListener {
}

View file

@ -1,5 +0,0 @@
package buttondevteam.alisolarflare.iiewar.listeners;
public class TeleportListener {
}