Skip to content

Commit 40d02dc

Browse files
TheMeinerLPTheMeinerLP
authored
Merge pull request #5 from OneLiteFeatherNET/fix/legacyColors
Fix/legacy colors
2 parents 797f596 + 0d4800f commit 40d02dc

5 files changed

Lines changed: 60 additions & 22 deletions

File tree

‎build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ext {
4444
version = "%s%s".format(Locale.ROOT, baseVersion, extension)
4545
group = "dev.themeinerlp.bettergopaint"
4646

47-
val minecraftVersion = "1.20.1"
47+
val minecraftVersion = "1.20.2"
4848
val supportedMinecraftVersions = listOf(
4949
"1.16.5",
5050
"1.17",
@@ -59,6 +59,9 @@ val supportedMinecraftVersions = listOf(
5959
"1.19.4",
6060
"1.20",
6161
"1.20.1",
62+
"1.20.2",
63+
"1.20.3",
64+
"1.20.4"
6265
)
6366

6467
repositories {

‎src/main/java/dev/themeinerlp/bettergopaint/command/Handler.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
6262
return true;
6363
} else if (args.length == 1) {
6464
if (args[0].equalsIgnoreCase("size")) {
65-
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "§<red>/gp size [number]"));
65+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size [number]"));
6666
return true;
6767
} else if (args[0].equalsIgnoreCase("toggle")) {
6868
if (pb.isEnabled()) {
6969
pb.toggleEnabled();
70-
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "§cDisabled brush"));
70+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>Disabled brush"));
7171
} else {
7272
pb.toggleEnabled();
73-
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "§aEnabled brush"));
73+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<green>Enabled brush"));
7474
}
7575
return true;
7676
} else if ((args[0].equalsIgnoreCase("reload") || args[0].equalsIgnoreCase("r")) && p.hasPermission(
@@ -79,10 +79,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
7979
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<green>Reloaded"));
8080
return true;
8181
} else if (args[0].equalsIgnoreCase("info") || args[0].equalsIgnoreCase("i")) {
82-
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix+ " <aqua>Created by: <gold>TheMeinerLP"));
83-
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix+ " <aqua>Links: <gold><click:url_open:'https" +
84-
"://twitter.com/themeinerlp'>Twitter " +
85-
"</click>"));
82+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix+ "<aqua>Created by: <gold>TheMeinerLP"));
83+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix+ "<aqua>Links: <gold><click:open_url:https" +
84+
"://twitter.com/themeinerlp'><u>Twitter</u></click>"));
8685
return true;
8786
}
8887
if (p.hasPermission("bettergopaint.admin")) {

‎src/main/java/dev/themeinerlp/bettergopaint/command/ReloadCommand.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* goPaint is designed to simplify painting inside of Minecraft.
3+
* Copyright (C) Arcaniax-Development
4+
* Copyright (C) Arcaniax team and contributors
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
18+
*/
119
package dev.themeinerlp.bettergopaint.command;
220

321
import cloud.commandframework.annotations.CommandMethod;

‎src/main/java/dev/themeinerlp/bettergopaint/listeners/InteractListener.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void onClick(PlayerInteractEvent e) {
6060
.getItemInHand()
6161
.getItemMeta()
6262
.getDisplayName()
63-
.startsWith(" §b♦ ") && e.getPlayer().getItemInHand().getItemMeta().hasLore()) {
63+
.startsWith(" <aqua>♦ ") && e.getPlayer().getItemInHand().getItemMeta().hasLore()) {
6464
final ExportedPlayerBrush epb = new ExportedPlayerBrush(e
6565
.getPlayer()
6666
.getItemInHand()
@@ -99,7 +99,8 @@ public void onClick(PlayerInteractEvent e) {
9999
if (pb.isEnabled()) {
100100
BukkitAdapter.adapt(p).runAsyncIfFree(() -> pb.getBrush().paint(loc, p));
101101
} else {
102-
p.sendMessage(MiniMessage.miniMessage().deserialize(Settings.settings().GENERIC.PREFIX + "§cYour brush is disabled, left click to enable the brush."));
102+
p.sendMessage(MiniMessage.miniMessage().deserialize(Settings.settings().GENERIC.PREFIX + "<red>Your brush is " +
103+
"disabled, left click to enable the brush."));
103104
}
104105
}
105106
if (e.getPlayer().getItemInHand().getType() == XMaterial.FEATHER.parseMaterial() && (e

‎src/main/java/dev/themeinerlp/bettergopaint/utils/Constants.java‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* goPaint is designed to simplify painting inside of Minecraft.
3+
* Copyright (C) Arcaniax-Development
4+
* Copyright (C) Arcaniax team and contributors
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
18+
*/
119
package dev.themeinerlp.bettergopaint.utils;
220

321
public final class Constants {
@@ -6,16 +24,15 @@ public final class Constants {
624
public static final int BSTATS_ID = 18734;
725

826
// Gui Items
9-
10-
public static final String headSphere = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmU5OGY0ODU2MDE0N2MwYTJkNGVkYzE3ZjZkOTg1ZThlYjVkOTRiZDcyZmM2MDc0NGE1YThmMmQ5MDVhMTgifX19";
11-
public static final String headSpray = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjg4MGY3NjVlYTgwZGVlMzcwODJkY2RmZDk4MTJlZTM2ZmRhODg0ODY5MmE4NDFiZWMxYmJkOWVkNTFiYTIyIn19fQ==";
12-
public static final String headSplatter = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzMzODI5MmUyZTY5ZjA5MDY5NGNlZjY3MmJiNzZmMWQ4Mzc1OGQxMjc0NGJiNmZmYzY4MzRmZGJjMWE5ODMifX19";
13-
public static final String headDisc = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjFmMjgyNTBkMWU0MjBhNjUxMWIwMzk2NDg2OGZjYTJmNTYzN2UzYWJhNzlmNGExNjNmNGE4ZDYxM2JlIn19fQ==";
14-
public static final String headBucket = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTAxOGI0NTc0OTM5Nzg4YTJhZDU1NTJiOTEyZDY3ODEwNjk4ODhjNTEyMzRhNGExM2VhZGI3ZDRjOTc5YzkzIn19fQ==";
15-
public static final String headAngle = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmRlNDQ4ZjBkYmU3NmJiOGE4MzJjOGYzYjJhMDNkMzViZDRlMjc4NWZhNWU4Mjk4YzI2MTU1MDNmNDdmZmEyIn19fQ==";
16-
public static final String headOverlay = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGYzMWQ2Zjk2NTRmODc0ZWE5MDk3YWRlZWEwYzk2OTk2ZTc4ZTNmZDM3NTRmYmY5ZWJlOTYzYWRhZDliZTRjIn19fQ==";
17-
public static final String headFracture = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjNkZjczZWVlNjIyNGM1YzVkOTQ4ZDJhMzQ1ZGUyNWYyMDhjYmQ5YWY3MTA4Y2UxZTFiNjFhNTg2ZGU5OGIyIn19fQ==";
18-
public static final String headGradient = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjA2MmRhM2QzYjhmMWZkMzUzNDNjYzI3OWZiMGZlNWNmNGE1N2I1YWJjNDMxZmJiNzhhNzNiZjJhZjY3NGYifX19";
19-
public static final String headPaint = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODBiM2E5ZGZhYmVmYmRkOTQ5YjIxN2JiZDRmYTlhNDg2YmQwYzNmMGNhYjBkMGI5ZGZhMjRjMzMyZGQzZTM0MiJ9fX0=";
20-
public static final String headBlend = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWU5MTg0YWYxZGU3ZTViN2M0YWQ0MTFjNTZhZjRmOTMzNjY1MzYxNTkyOWJjOTVkNzEzYjdhNDJjZmYzZmJhZCJ9fX0=";
27+
public static final String HEADSPHERE = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmU5OGY0ODU2MDE0N2MwYTJkNGVkYzE3ZjZkOTg1ZThlYjVkOTRiZDcyZmM2MDc0NGE1YThmMmQ5MDVhMTgifX19";
28+
public static final String HEADSPRAY = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjg4MGY3NjVlYTgwZGVlMzcwODJkY2RmZDk4MTJlZTM2ZmRhODg0ODY5MmE4NDFiZWMxYmJkOWVkNTFiYTIyIn19fQ==";
29+
public static final String HEADSPLATTER = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzMzODI5MmUyZTY5ZjA5MDY5NGNlZjY3MmJiNzZmMWQ4Mzc1OGQxMjc0NGJiNmZmYzY4MzRmZGJjMWE5ODMifX19";
30+
public static final String HEADDISC = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjFmMjgyNTBkMWU0MjBhNjUxMWIwMzk2NDg2OGZjYTJmNTYzN2UzYWJhNzlmNGExNjNmNGE4ZDYxM2JlIn19fQ==";
31+
public static final String HEADBUCKET = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTAxOGI0NTc0OTM5Nzg4YTJhZDU1NTJiOTEyZDY3ODEwNjk4ODhjNTEyMzRhNGExM2VhZGI3ZDRjOTc5YzkzIn19fQ==";
32+
public static final String HEADANGLE = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmRlNDQ4ZjBkYmU3NmJiOGE4MzJjOGYzYjJhMDNkMzViZDRlMjc4NWZhNWU4Mjk4YzI2MTU1MDNmNDdmZmEyIn19fQ==";
33+
public static final String HEADOVERLAY = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGYzMWQ2Zjk2NTRmODc0ZWE5MDk3YWRlZWEwYzk2OTk2ZTc4ZTNmZDM3NTRmYmY5ZWJlOTYzYWRhZDliZTRjIn19fQ==";
34+
public static final String HEADFRACTURE = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjNkZjczZWVlNjIyNGM1YzVkOTQ4ZDJhMzQ1ZGUyNWYyMDhjYmQ5YWY3MTA4Y2UxZTFiNjFhNTg2ZGU5OGIyIn19fQ==";
35+
public static final String HEADGRADIENT = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjA2MmRhM2QzYjhmMWZkMzUzNDNjYzI3OWZiMGZlNWNmNGE1N2I1YWJjNDMxZmJiNzhhNzNiZjJhZjY3NGYifX19";
36+
public static final String HEADPAINT = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODBiM2E5ZGZhYmVmYmRkOTQ5YjIxN2JiZDRmYTlhNDg2YmQwYzNmMGNhYjBkMGI5ZGZhMjRjMzMyZGQzZTM0MiJ9fX0=";
37+
public static final String HEADBLEND = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWU5MTg0YWYxZGU3ZTViN2M0YWQ0MTFjNTZhZjRmOTMzNjY1MzYxNTkyOWJjOTVkNzEzYjdhNDJjZmYzZmJhZCJ9fX0=";
2138
}

0 commit comments

Comments
 (0)