MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.3.4.1

Browse source
This commit is contained in:
Zontreck 2022-10-14 02:39:15 -07:00
parent 2ed19b6e0c
commit c7b01b00a3
27 changed files with 2518 additions and 2602 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/dev/zontreck/otemod/commands/FlyCommand.java
View file

@ -4,6 +4,7 @@ import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.otemod.OTEMod;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.contents.TranslatableContents;
@ -43,12 +44,12 @@ public class FlyCommand {
p.getAbilities().flying=false;
p.onUpdateAbilities();
ctx.sendSuccess(Component.literal(ChatColor.BOLD + "[" + ChatColor.DARK_GREEN + "OTEMOD" + ChatColor.WHITE + "] "+ChatColor.resetChat() + ChatColor.DARK_PURPLE + "Your ability to fly has been disabled"), false);
ctx.sendSuccess(Component.literal(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + "Your ability to fly has been disabled"), false);
}else {
p.getAbilities().mayfly=true;
p.onUpdateAbilities();
ctx.sendSuccess(Component.literal(ChatColor.BOLD + "[" + ChatColor.DARK_GREEN + "OTEMOD" + ChatColor.WHITE + "] "+ChatColor.resetChat() + ChatColor.DARK_PURPLE + "You can now fly"), false);
ctx.sendSuccess(Component.literal(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + "You can now fly"), false);
}
return 0;

12
src/main/java/dev/zontreck/otemod/commands/homes/DelHomeCommand.java
View file

@ -40,10 +40,6 @@ public class DelHomeCommand {
if(! ctx.isPlayer())
{
Style s = Style.EMPTY.withColor(TextColor.parseColor(ChatColor.DARK_RED)).withFont(Style.DEFAULT_FONT);
ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.translatable("dev.zontreck.otemod.msgs.only_player").withStyle(s), ctx.getServer());
return 1;
}
ServerPlayer p = ctx.getPlayer();
@ -61,13 +57,15 @@ public class DelHomeCommand {
pstat.execute();
ctx.sendSuccess(MutableComponent.create(new TranslatableContents("dev.zontreck.otemod.msgs.homes.del.success")), true);
ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + ChatColor.doColors("!dark_green! Home was deleted successfully")), ctx.getServer());
con.endRequest();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
ctx.sendFailure(Component.translatable("dev.zontreck.otemod.msgs.homes.del.fail"));
ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + ChatColor.doColors("!dark_red! Home was unable to be deleted")), ctx.getServer());
return 1;
}
return 0;

3
src/main/java/dev/zontreck/otemod/commands/homes/HomeCommand.java
View file

@ -124,7 +124,8 @@ public class HomeCommand {
Style sxx = Style.EMPTY.withColor(TextColor.parseColor(ChatColor.DARK_GREEN)).withFont(Style.DEFAULT_FONT);
ctx.sendSuccess(Component.translatable("dev.zontreck.otemod.msgs.homes.goto.success").withStyle(sxx), true);
ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + ChatColor.doColors("!dark_green!Home found! Wormhole opening now...")), ctx.getServer());
con.endRequest();
} catch (SQLException e) {
// TODO Auto-generated catch block

1
src/main/java/dev/zontreck/otemod/commands/homes/HomesCommand.java
View file

@ -35,7 +35,6 @@ public class HomesCommand {
if(! ctx.getSource().isPlayer())
{
ChatServerOverride.broadcastTo(ctx.getSource().getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), ctx.getSource().getServer());
return 1;
}
ServerPlayer p = ctx.getSource().getPlayer();

6
src/main/java/dev/zontreck/otemod/commands/homes/SetHomeCommand.java
View file

@ -42,7 +42,6 @@ public class SetHomeCommand {
if(! ctx.isPlayer())
{
ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), ctx.getServer());
return 1;
}
ServerPlayer p = ctx.getPlayer();
@ -64,13 +63,14 @@ public class SetHomeCommand {
pstat.execute();
ChatServerOverride.broadcastTo(p.getUUID(), Component.literal(ChatColor.DARK_GREEN).append(Component.translatable("dev.zontreck.otemod.msgs.homes.set.success")), ctx.getServer());
ChatServerOverride.broadcastTo(p.getUUID(), Component.literal(OTEMod.OTEPrefix + ChatColor.doColors(" !dark_green!Home was created or updated successfully!")), ctx.getServer());
con.endRequest();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
ctx.sendFailure(Component.translatable("dev.zontreck.otemod.msgs.homes.set.fail"));
ChatServerOverride.broadcastTo(p.getUUID(), Component.literal(OTEMod.OTEPrefix + ChatColor.doColors(" !dark_red!Home could not be updated or created for a unknown reason!")), ctx.getServer());
return 1;
}
return 0;

3
src/main/java/dev/zontreck/otemod/commands/profilecmds/ChatColorCommand.java
View file

@ -37,7 +37,6 @@ public class ChatColorCommand {
// Get profile
if(source.getPlayer()==null){
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
return 1;
}
Profile p = Profile.get_profile_of(source.getPlayer().getStringUUID());
@ -45,7 +44,7 @@ public class ChatColorCommand {
p.commit();
OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your chat color has been updated"), false);
source.sendSuccess(Component.literal(OTEMod.OTEPrefix + " "+ChatColor.DARK_PURPLE + "Your chat color has been updated"), false);
return 0;
}

2
src/main/java/dev/zontreck/otemod/commands/profilecmds/NameColorCommand.java
View file

@ -44,7 +44,7 @@ public class NameColorCommand {
p.commit();
OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your name color has been updated"), false);
source.sendSuccess(Component.literal(OTEMod.OTEPrefix+ " "+ChatColor.DARK_PURPLE + "Your name color has been updated"), false);
return 0;
}

2
src/main/java/dev/zontreck/otemod/commands/profilecmds/NickCommand.java
View file

@ -40,7 +40,7 @@ public class NickCommand {
p.commit();
OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your nickname has been updated"), false);
source.sendSuccess(Component.literal(OTEMod.OTEPrefix+ " "+ChatColor.DARK_PURPLE + "Your nickname has been updated"), false);
return 0;
}

2
src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixColorCommand.java
View file

@ -44,7 +44,7 @@ public class PrefixColorCommand {
p.commit();
OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your prefix color has been updated"), false);
source.sendSuccess(Component.literal(OTEMod.OTEPrefix+ " "+ChatColor.DARK_PURPLE + "Your prefix color has been updated"), false);
return 0;
}

2
src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixCommand.java
View file

@ -39,7 +39,7 @@ public class PrefixCommand {
p.commit();
OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your prefix has been updated"), false);
source.sendSuccess(Component.literal(OTEMod.OTEPrefix+ " "+ChatColor.DARK_PURPLE + "Your prefix has been updated"), false);
return 0;
}

2
src/main/java/dev/zontreck/otemod/commands/teleport/TPAcceptCommand.java
View file

@ -36,7 +36,7 @@ public class TPAcceptCommand {
ServerPlayer from = source.getServer().getPlayerList().getPlayer(cont.FromPlayer);
ServerPlayer to = source.getServer().getPlayerList().getPlayer(cont.ToPlayer);
Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was accepted. Opening wormhole!");
Component comp = Component.literal(OTEMod.OTEPrefix + " " + ChatColor.DARK_PURPLE+"Teleport request was accepted. Opening wormhole!");
ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());

2
src/main/java/dev/zontreck/otemod/commands/teleport/TPCancelCommand.java
View file

@ -31,7 +31,7 @@ public class TPCancelCommand {
for(TeleportContainer cont : OTEMod.TeleportRegistry){
if(cont.TeleportID.equals(teleporter)){
// Canceling!
Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was cancelled");
Component comp = Component.literal(OTEMod.OTEPrefix + " " + ChatColor.DARK_PURPLE+"Teleport request was cancelled");
ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());

2
src/main/java/dev/zontreck/otemod/commands/teleport/TPDenyCommand.java
View file

@ -31,7 +31,7 @@ public class TPDenyCommand {
for(TeleportContainer cont : OTEMod.TeleportRegistry){
if(cont.TeleportID.equals(teleporter)){
// Canceling!
Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was denied");
Component comp = Component.literal(OTEMod.OTEPrefix + " " + ChatColor.DARK_PURPLE+"Teleport request was denied");
ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());

3
src/main/java/dev/zontreck/otemod/commands/warps/DelWarpCommand.java
View file

@ -36,8 +36,7 @@ public class DelWarpCommand {
if(! source.isPlayer())
{
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + OTEMod.ONLY_PLAYER), source.getServer());
return 1;
}
ServerPlayer p = source.getPlayer();

3
src/main/java/dev/zontreck/otemod/commands/warps/RTPWarpCommand.java
View file

@ -37,7 +37,8 @@ public class RTPWarpCommand {
if(! source.isPlayer())
{
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + OTEMod.ONLY_PLAYER), source.getServer());
return 1;
}
ServerPlayer p = source.getPlayer();

2
src/main/java/dev/zontreck/otemod/commands/warps/SetWarpCommand.java
View file

@ -37,7 +37,7 @@ public class SetWarpCommand {
if(! source.isPlayer())
{
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + OTEMod.ONLY_PLAYER), source.getServer());
return 1;
}
ServerPlayer p = source.getPlayer();

6
src/main/java/dev/zontreck/otemod/commands/warps/WarpCommand.java
View file

@ -37,7 +37,11 @@ public class WarpCommand {
}
private static int warp(CommandSourceStack source, String string) {
if(!source.isPlayer())return 1;
if(!source.isPlayer()){
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + OTEMod.ONLY_PLAYER), source.getServer());
return 1;
}
ServerPlayer p = source.getPlayer();
Connection con = OTEMod.DB.getConnection();

3
src/main/java/dev/zontreck/otemod/commands/warps/WarpsCommand.java
View file

@ -41,6 +41,7 @@ public class WarpsCommand {
private static int warps(CommandSourceStack source) {
if(!source.isPlayer())
{
ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(OTEMod.OTEPrefix + OTEMod.ONLY_PLAYER), source.getServer());
return 1;
}
@ -59,7 +60,7 @@ public class WarpsCommand {
count++;
}
rs=pstat.executeQuery();// Reset the query
ChatServerOverride.broadcastTo(p.getUUID(), Component.literal(ChatColor.DARK_GRAY+"["+ChatColor.DARK_GREEN+"OTEMOD" + ChatColor.DARK_GRAY+"] "+ChatColor.resetChat() + "There are "+count+" warps available"), source.getServer());
ChatServerOverride.broadcastTo(p.getUUID(), Component.literal(OTEMod.OTEPrefix + " "+ChatColor.resetChat() + "There are "+count+" warps available"), source.getServer());
while(rs.next())
{