Chikachi
/
DiscordIntegration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Getting ready for v3 release

master
Chikachi 2017-07-30 06:36:51 +02:00
parent e9fbd17e89
commit 104a28223d
No known key found for this signature in database
GPG Key ID: 0136086A0AC09F5E
6 changed files with 455 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:3.4.1'
}
@ -29,9 +29,9 @@ apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'java'
apply plugin: 'com.diffplug.gradle.spotless'
def mcVersion = '1.10.2'
def forgeVersion = '12.18.3.2185'
def modVersion = '3.0.0-alpha'
def mcVersion = '1.12'
def forgeVersion = '14.21.1.2426'
def modVersion = '3.0.0'
version = 'mc' + mcVersion + '-' + modVersion
group = "chikachi.discord"
@ -49,7 +49,7 @@ minecraft {
runDir = 'run'
}
mappings = "stable_29"
mappings = "snapshot_20170624"
}
def printDebug(message) {
@ -88,7 +88,7 @@ class CurseForgeDependencyInfo {
// Dependencies on CurseForge
List<CurseForgeDependencyInfo> curseForgeDependencies = new ArrayList<CurseForgeDependencyInfo>()
curseForgeDependencies.add(new CurseForgeDependencyInfo("Dynmap", "2.4-forge-1.10.2", "jar", "2380601"))
curseForgeDependencies.add(new CurseForgeDependencyInfo("Dynmap", "2.6-beta-1-forge-1.12", "jar", "2436596"))
dependencies {
compile files('./libs/JDA-3.2.0_226-withDependencies.jar')
@ -115,14 +115,6 @@ dependencies {
testCompile 'junit:junit:4.12'
}
jar {
manifest {
attributes(
"FMLAT": 'discordintegration_at.cfg'
)
}
}
shadowJar {
classifier = ""
relocate "com.mashape.unirest", "chikachi.discord.repack.com.mashape.unirest"

3
gradle.properties Normal file
View File

@ -0,0 +1,3 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

3
src/main/java/chikachi/discord/DiscordFakeNetServerHandler.java
View File

@ -20,6 +20,7 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.client.*;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.ITextComponent;
import javax.annotation.ParametersAreNonnullByDefault;
@ -38,7 +39,7 @@ public class DiscordFakeNetServerHandler extends NetHandlerPlayServer {
}
@Override
public void disconnect(String reason) {
public void disconnect(final ITextComponent textComponent) {
}

889
src/main/java/chikachi/discord/listener/MinecraftListener.java
View File

@ -1,446 +1,443 @@
/*
* Copyright (C) 2017 Chikachi
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see http://www.gnu.org/licenses.
*/
package chikachi.discord.listener;
import chikachi.discord.core.CoreUtils;
import chikachi.discord.core.DiscordClient;
import chikachi.discord.core.Message;
import chikachi.discord.core.config.Configuration;
import chikachi.discord.core.config.minecraft.MinecraftConfig;
import chikachi.discord.core.config.minecraft.MinecraftDimensionConfig;
import chikachi.discord.core.config.types.MessageConfig;
import com.google.common.base.Joiner;
import net.dv8tion.jda.core.entities.User;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.stats.Achievement;
import net.minecraft.stats.StatisticsManagerServer;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.event.CommandEvent;
import net.minecraftforge.event.ServerChatEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.player.AchievementEvent;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import java.util.ArrayList;
import java.util.HashMap;
public class MinecraftListener {
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onCommand(CommandEvent event) {
if (event.isCanceled()) return;
String commandName = event.getCommand().getName();
ICommandSender sender = event.getSender();
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig;
if (commandName.equalsIgnoreCase("say") || commandName.equalsIgnoreCase("me")) {
boolean isSayCommand = commandName.equalsIgnoreCase("say");
if (isSayCommand && !Configuration.getConfig().minecraft.dimensions.generic.relaySayCommand) {
return;
}
if (!isSayCommand && !Configuration.getConfig().minecraft.dimensions.generic.relayMeCommand) {
return;
}
if (sender != null && Configuration.getConfig().minecraft.dimensions.generic.ignoreFakePlayerChat && sender instanceof FakePlayer) {
return;
}
String message = Joiner.on(" ").join(event.getParameters());
if (Configuration.getConfig().minecraft.dimensions.generic.isMessageIgnored(message)) {
return;
}
HashMap<String, String> arguments = new HashMap<>();
arguments.put("MESSAGE", isSayCommand ? message : "_" + message + "_");
String prefix = minecraftConfig.dimensions.generic.chatPrefix;
messageConfig = minecraftConfig.dimensions.generic.messages.chatMessage;
ArrayList<Long> channels;
if (sender != null) {
Entity entity = sender.getCommandSenderEntity();
if (entity != null) {
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entity.dimension);
if (dimensionConfig.chatPrefix != null && dimensionConfig.chatPrefix.trim().length() > 0) {
prefix = dimensionConfig.chatPrefix;
}
if (dimensionConfig.messages.chatMessage != null) {
messageConfig = dimensionConfig.messages.chatMessage;
}
channels = dimensionConfig.relayChat.getChannels(
genericConfig.relayChat.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
);
} else {
channels = genericConfig.relayChat.getChannels(genericConfig.discordChannel);
}
} else {
channels = genericConfig.relayChat.getChannels(genericConfig.discordChannel);
}
String authorName = null;
String avatarUrl = null;
//noinspection Duplicates
if (sender != null) {
authorName = sender.getName();
if (sender instanceof EntityPlayer) {
avatarUrl = CoreUtils.getAvatarUrl(sender.getName());
Long discordId = Configuration.getLinking().getDiscordId(((EntityPlayer) sender).getGameProfile().getId());
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments)
.setPrefix(prefix),
channels
);
} else if (commandName.equalsIgnoreCase("discord")) {
// Do not relay linking commands
if (event.getParameters().length > 0 && event.getParameters()[0].equalsIgnoreCase("link")) {
return;
}
}
ArrayList<Long> channels;
messageConfig = minecraftConfig.dimensions.generic.messages.command;
if (sender != null) {
Entity entity = sender.getCommandSenderEntity();
if (entity != null) {
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entity.dimension);
if (dimensionConfig.messages.command != null) {
messageConfig = dimensionConfig.messages.command;
}
channels = dimensionConfig.relayCommands.getChannels(
genericConfig.relayCommands.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
);
} else {
channels = genericConfig.relayCommands.getChannels(genericConfig.discordChannel);
}
} else {
channels = genericConfig.relayCommands.getChannels(genericConfig.discordChannel);
}
HashMap<String, String> arguments = new HashMap<>();
arguments.put("COMMAND", event.getCommand().getName());
arguments.put("ARGUMENTS", Joiner.on(" ").join(event.getParameters()));
String authorName = null;
String avatarUrl = null;
//noinspection Duplicates
if (sender != null) {
authorName = sender.getName();
if (sender instanceof EntityPlayer) {
avatarUrl = CoreUtils.getAvatarUrl(sender.getName());
Long discordId = Configuration.getLinking().getDiscordId(((EntityPlayer) sender).getGameProfile().getId());
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments)
.setParsing(false),
channels
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onChatMessage(ServerChatEvent event) {
if (event.isCanceled() || event.getPlayer() == null) return;
if (Configuration.getConfig().minecraft.dimensions.generic.ignoreFakePlayerChat && event.getPlayer() instanceof FakePlayer) {
return;
}
if (Configuration.getConfig().minecraft.dimensions.generic.isMessageIgnored(event.getMessage())) {
return;
}
HashMap<String, String> arguments = new HashMap<>();
arguments.put("MESSAGE", event.getMessage());
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(event.getPlayer().dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.chatMessage != null ? dimensionConfig.messages.chatMessage : genericConfig.messages.chatMessage;
String authorName = event.getUsername();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(event.getPlayer().getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments)
.setPrefix(dimensionConfig.chatPrefix != null && dimensionConfig.chatPrefix.trim().length() > 0 ? dimensionConfig.chatPrefix : genericConfig.chatPrefix),
dimensionConfig.relayChat.getChannels(
genericConfig.relayChat.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerAchievement(AchievementEvent event) {
if (event.isCanceled()) return;
EntityPlayer entityPlayer = event.getEntityPlayer();
if (entityPlayer != null && entityPlayer instanceof EntityPlayerMP) {
StatisticsManagerServer playerStats = ((EntityPlayerMP) entityPlayer).getStatFile();
if (playerStats.hasAchievementUnlocked(event.getAchievement()) || !playerStats.canUnlockAchievement(event.getAchievement())) {
return;
}
Achievement achievement = event.getAchievement();
HashMap<String, String> arguments = new HashMap<>();
arguments.put("ACHIEVEMENT", achievement.getStatName().getUnformattedText());
// TODO: Figure out what to do with I18n - Might remove the description...
//noinspection deprecation
arguments.put("DESCRIPTION", I18n.translateToLocalFormatted(achievement.achievementDescription, "KEY"));
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entityPlayer.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.achievement != null ? dimensionConfig.messages.achievement : genericConfig.messages.achievement;
String authorName = entityPlayer.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(entityPlayer.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments),
dimensionConfig.relayAchievements.getChannels(
genericConfig.relayAchievements.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
if (event.isCanceled() || event.player == null) return;
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(event.player.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.playerJoin != null ? dimensionConfig.messages.playerJoin : genericConfig.messages.playerJoin;
String authorName = event.player.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(event.player.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig),
dimensionConfig.relayPlayerJoin.getChannels(
genericConfig.relayPlayerJoin.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerLeave(PlayerEvent.PlayerLoggedOutEvent event) {
if (event.isCanceled() || event.player == null) return;
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(event.player.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.playerLeave != null ? dimensionConfig.messages.playerLeave : genericConfig.messages.playerLeave;
String authorName = event.player.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(event.player.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig),
dimensionConfig.relayPlayerLeave.getChannels(
genericConfig.relayPlayerLeave.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerDeath(LivingDeathEvent event) {
EntityLivingBase entityLiving = event.getEntityLiving();
if (event.isCanceled() || entityLiving == null) return;
if (entityLiving instanceof EntityPlayer) {
EntityPlayer entityPlayer = (EntityPlayer) entityLiving;
HashMap<String, String> arguments = new HashMap<>();
arguments.put("REASON", entityPlayer.getCombatTracker().getDeathMessage().getUnformattedText().replace(entityPlayer.getDisplayNameString(), "").trim());
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entityLiving.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.playerDeath != null ? dimensionConfig.messages.playerDeath : genericConfig.messages.playerDeath;
String authorName = entityPlayer.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(entityPlayer.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments),
dimensionConfig.relayPlayerDeath.getChannels(
genericConfig.relayPlayerDeath.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
}
}
/*
* Copyright (C) 2017 Chikachi
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see http://www.gnu.org/licenses.
*/
package chikachi.discord.listener;
import chikachi.discord.core.CoreUtils;
import chikachi.discord.core.DiscordClient;
import chikachi.discord.core.Message;
import chikachi.discord.core.config.Configuration;
import chikachi.discord.core.config.minecraft.MinecraftConfig;
import chikachi.discord.core.config.minecraft.MinecraftDimensionConfig;
import chikachi.discord.core.config.types.MessageConfig;
import com.google.common.base.Joiner;
import net.dv8tion.jda.core.entities.User;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.event.CommandEvent;
import net.minecraftforge.event.ServerChatEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import java.util.ArrayList;
import java.util.HashMap;
public class MinecraftListener {
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onCommand(CommandEvent event) {
if (event.isCanceled()) return;
String commandName = event.getCommand().getName();
ICommandSender sender = event.getSender();
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig;
if (commandName.equalsIgnoreCase("say") || commandName.equalsIgnoreCase("me")) {
boolean isSayCommand = commandName.equalsIgnoreCase("say");
if (isSayCommand && !Configuration.getConfig().minecraft.dimensions.generic.relaySayCommand) {
return;
}
if (!isSayCommand && !Configuration.getConfig().minecraft.dimensions.generic.relayMeCommand) {
return;
}
if (sender != null && Configuration.getConfig().minecraft.dimensions.generic.ignoreFakePlayerChat && sender instanceof FakePlayer) {
return;
}
String message = Joiner.on(" ").join(event.getParameters());
if (Configuration.getConfig().minecraft.dimensions.generic.isMessageIgnored(message)) {
return;
}
HashMap<String, String> arguments = new HashMap<>();
arguments.put("MESSAGE", isSayCommand ? message : "_" + message + "_");
String prefix = minecraftConfig.dimensions.generic.chatPrefix;
messageConfig = minecraftConfig.dimensions.generic.messages.chatMessage;
ArrayList<Long> channels;
if (sender != null) {
Entity entity = sender.getCommandSenderEntity();
if (entity != null) {
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entity.dimension);
if (dimensionConfig.chatPrefix != null && dimensionConfig.chatPrefix.trim().length() > 0) {
prefix = dimensionConfig.chatPrefix;
}
if (dimensionConfig.messages.chatMessage != null) {
messageConfig = dimensionConfig.messages.chatMessage;
}
channels = dimensionConfig.relayChat.getChannels(
genericConfig.relayChat.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
);
} else {
channels = genericConfig.relayChat.getChannels(genericConfig.discordChannel);
}
} else {
channels = genericConfig.relayChat.getChannels(genericConfig.discordChannel);
}
String authorName = null;
String avatarUrl = null;
//noinspection Duplicates
if (sender != null) {
authorName = sender.getName();
if (sender instanceof EntityPlayer) {
avatarUrl = CoreUtils.getAvatarUrl(sender.getName());
Long discordId = Configuration.getLinking().getDiscordId(((EntityPlayer) sender).getGameProfile().getId());
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments)
.setPrefix(prefix),
channels
);
} else if (commandName.equalsIgnoreCase("discord")) {
// Do not relay linking commands
if (event.getParameters().length > 0 && event.getParameters()[0].equalsIgnoreCase("link")) {
return;
}
}
ArrayList<Long> channels;
messageConfig = minecraftConfig.dimensions.generic.messages.command;
if (sender != null) {
Entity entity = sender.getCommandSenderEntity();
if (entity != null) {
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entity.dimension);
if (dimensionConfig.messages.command != null) {
messageConfig = dimensionConfig.messages.command;
}
channels = dimensionConfig.relayCommands.getChannels(
genericConfig.relayCommands.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
);
} else {
channels = genericConfig.relayCommands.getChannels(genericConfig.discordChannel);
}
} else {
channels = genericConfig.relayCommands.getChannels(genericConfig.discordChannel);
}
HashMap<String, String> arguments = new HashMap<>();
arguments.put("COMMAND", event.getCommand().getName());
arguments.put("ARGUMENTS", Joiner.on(" ").join(event.getParameters()));
String authorName = null;
String avatarUrl = null;
//noinspection Duplicates
if (sender != null) {
authorName = sender.getName();
if (sender instanceof EntityPlayer) {
avatarUrl = CoreUtils.getAvatarUrl(sender.getName());
Long discordId = Configuration.getLinking().getDiscordId(((EntityPlayer) sender).getGameProfile().getId());
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments)
.setParsing(false),
channels
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onChatMessage(ServerChatEvent event) {
if (event.isCanceled() || event.getPlayer() == null) return;
if (Configuration.getConfig().minecraft.dimensions.generic.ignoreFakePlayerChat && event.getPlayer() instanceof FakePlayer) {
return;
}
if (Configuration.getConfig().minecraft.dimensions.generic.isMessageIgnored(event.getMessage())) {
return;
}
HashMap<String, String> arguments = new HashMap<>();
arguments.put("MESSAGE", event.getMessage());
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(event.getPlayer().dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.chatMessage != null ? dimensionConfig.messages.chatMessage : genericConfig.messages.chatMessage;
String authorName = event.getUsername();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(event.getPlayer().getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments)
.setPrefix(dimensionConfig.chatPrefix != null && dimensionConfig.chatPrefix.trim().length() > 0 ? dimensionConfig.chatPrefix : genericConfig.chatPrefix),
dimensionConfig.relayChat.getChannels(
genericConfig.relayChat.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
/*
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerAchievement(AchievementEvent event) {
if (event.isCanceled()) return;
EntityPlayer entityPlayer = event.getEntityPlayer();
if (entityPlayer != null && entityPlayer instanceof EntityPlayerMP) {
StatisticsManagerServer playerStats = ((EntityPlayerMP) entityPlayer).getStatFile();
if (playerStats.hasAchievementUnlocked(event.getAchievement()) || !playerStats.canUnlockAchievement(event.getAchievement())) {
return;
}
Achievement achievement = event.getAchievement();
HashMap<String, String> arguments = new HashMap<>();
arguments.put("ACHIEVEMENT", achievement.getStatName().getUnformattedText());
// TODO: Figure out what to do with I18n - Might remove the description...
//noinspection deprecation
arguments.put("DESCRIPTION", I18n.translateToLocalFormatted(achievement.achievementDescription, "KEY"));
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entityPlayer.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.achievement != null ? dimensionConfig.messages.achievement : genericConfig.messages.achievement;
String authorName = entityPlayer.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(entityPlayer.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments),
dimensionConfig.relayAchievements.getChannels(
genericConfig.relayAchievements.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
}
*/
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
if (event.isCanceled() || event.player == null) return;
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(event.player.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.playerJoin != null ? dimensionConfig.messages.playerJoin : genericConfig.messages.playerJoin;
String authorName = event.player.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(event.player.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig),
dimensionConfig.relayPlayerJoin.getChannels(
genericConfig.relayPlayerJoin.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerLeave(PlayerEvent.PlayerLoggedOutEvent event) {
if (event.isCanceled() || event.player == null) return;
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(event.player.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.playerLeave != null ? dimensionConfig.messages.playerLeave : genericConfig.messages.playerLeave;
String authorName = event.player.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(event.player.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig),
dimensionConfig.relayPlayerLeave.getChannels(
genericConfig.relayPlayerLeave.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onPlayerDeath(LivingDeathEvent event) {
EntityLivingBase entityLiving = event.getEntityLiving();
if (event.isCanceled() || entityLiving == null) return;
if (entityLiving instanceof EntityPlayer) {
EntityPlayer entityPlayer = (EntityPlayer) entityLiving;
HashMap<String, String> arguments = new HashMap<>();
arguments.put("REASON", entityPlayer.getCombatTracker().getDeathMessage().getUnformattedText().replace(entityPlayer.getDisplayNameString(), "").trim());
MinecraftConfig minecraftConfig = Configuration.getConfig().minecraft;
MinecraftDimensionConfig dimensionConfig = minecraftConfig.dimensions.getDimension(entityLiving.dimension);
MinecraftDimensionConfig genericConfig = minecraftConfig.dimensions.generic;
MessageConfig messageConfig = dimensionConfig.messages.playerDeath != null ? dimensionConfig.messages.playerDeath : genericConfig.messages.playerDeath;
String authorName = entityPlayer.getDisplayNameString();
String avatarUrl = CoreUtils.getAvatarUrl(authorName);
Long discordId = Configuration.getLinking().getDiscordId(entityPlayer.getGameProfile().getId());
//noinspection Duplicates
if (discordId != null) {
User discordUser = DiscordClient.getInstance().getUser(discordId);
if (discordUser != null) {
authorName = discordUser.getName();
avatarUrl = discordUser.getAvatarUrl();
}
}
DiscordClient.getInstance().broadcast(
new Message()
.setAuthor(authorName)
.setAvatarUrl(avatarUrl)
.setMessage(messageConfig)
.setArguments(arguments),
dimensionConfig.relayPlayerDeath.getChannels(
genericConfig.relayPlayerDeath.getChannels(
dimensionConfig.discordChannel.getChannels(
genericConfig.discordChannel
)
)
)
);
}
}
}

1
src/main/resources/META-INF/discordintegration_at.cfg
View File

@ -1 +0,0 @@
public net.minecraft.stats.Achievement field_75996_k # achievementDescription