greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Gimme more #545

Merged
greg6775 merged 140 commits from master into hax-dev 2020-09-19 23:18:45 +02:00
Conversation 0 Commits 140 Files changed 71 +32 -31
16 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9b6a672239 - Show all commits

1
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -26,6 +26,7 @@ import com.bbn.hadder.commands.fun.*;
import com.bbn.hadder.commands.settings.*;
import com.bbn.hadder.commands.music.*;
import com.bbn.hadder.core.*;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.listener.*;
import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.Activity;

6
src/main/java/com/bbn/hadder/commands/CommandEvent.java
View file

@ -16,9 +16,9 @@
package com.bbn.hadder.commands;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.general.HelpCommand;
import com.bbn.hadder.core.CommandHandler;

2
src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
View file

@ -16,7 +16,7 @@
package com.bbn.hadder.commands.owner;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm;

6
src/main/java/com/bbn/hadder/core/CommandHandler.java
View file

@ -16,9 +16,9 @@
package com.bbn.hadder.core;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;

6
src/main/java/com/bbn/hadder/Rethink.java → src/main/java/com/bbn/hadder/db/Rethink.java
View file

@ -10,11 +10,11 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bbn.hadder;
package com.bbn.hadder.db;
import com.bbn.hadder.core.Config;
import com.rethinkdb.RethinkDB;
@ -31,7 +31,7 @@ public class Rethink {
private Connection conn;
private Config config;
Rethink(Config config) {
public Rethink(Config config) {
this.config = config;
}

4
src/main/java/com/bbn/hadder/RethinkServer.java → src/main/java/com/bbn/hadder/db/RethinkServer.java
View file

@ -10,11 +10,11 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bbn.hadder;
package com.bbn.hadder.db;
import org.json.JSONObject;

4
src/main/java/com/bbn/hadder/RethinkUser.java → src/main/java/com/bbn/hadder/db/RethinkUser.java
View file

@ -10,11 +10,11 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bbn.hadder;
package com.bbn.hadder.db;
import org.json.JSONObject;

6
src/main/java/com/bbn/hadder/listener/CommandListener.java
View file

@ -16,9 +16,9 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.core.CommandHandler;
import net.dv8tion.jda.api.EmbedBuilder;

2
src/main/java/com/bbn/hadder/listener/GuildListener.java
View file

@ -16,7 +16,7 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.core.Config;
import com.bbn.hadder.utils.BotList;
import com.bbn.hadder.utils.MessageEditor;

4
src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
View file

@ -16,8 +16,8 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.Message;

6
src/main/java/com/bbn/hadder/listener/MentionListener.java
View file

@ -16,9 +16,9 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import com.bbn.hadder.db.RethinkUser;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

4
src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
View file

@ -16,8 +16,8 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkUser;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType;

2
src/main/java/com/bbn/hadder/listener/ReadyListener.java
View file

@ -16,7 +16,7 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.core.Config;
import com.bbn.hadder.utils.BotList;
import net.dv8tion.jda.api.entities.Guild;

4
src/main/java/com/bbn/hadder/listener/RulesListener.java
View file

@ -16,8 +16,8 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;

4
src/main/java/com/bbn/hadder/listener/StarboardListener.java
View file

@ -16,8 +16,8 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.RethinkServer;
import com.bbn.hadder.db.Rethink;
import com.bbn.hadder.db.RethinkServer;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.entities.MessageReaction;

2
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -16,7 +16,7 @@
package com.bbn.hadder.utils;
import com.bbn.hadder.RethinkUser;
import com.bbn.hadder.db.RethinkUser;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.User;