Skip to content

Commit

Permalink
change word "cooldown" to "cd" and typo
Browse files Browse the repository at this point in the history
Signed-off-by: LSDog <2509863159@qq.com>
  • Loading branch information
LSDog committed Apr 14, 2024
1 parent 5f65b7c commit 416e452
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 34 deletions.
44 changes: 22 additions & 22 deletions src/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ check_update: true
############ NUMBER CONFIGS ##############
############ 数字有关的配置 ##############

distance: 4.5
# |玩家喷漆到方块的最大距离 (格)
# |Max distance from player to spray surface (Block)
# 默认|Default: 4.5

big_size: 3
# |大喷漆的大小 (格), 允许 3 或 5
# |Big spray size (Block), allow 3 or 5
Expand All @@ -90,43 +95,38 @@ big_mode: 1
# 2: Sprays onto nearby surfaces if there's a block covering
# 默认|Default: 1

distance: 4.5
# |玩家喷漆到方块的最大距离 (格)
# |Max distance from player to block (Block)
# 默认|Default: 4.5

destroy: 40
# |玩家喷漆自动消失时间 (秒)
# |Spray self destruct time (Second)
# 默认|Default: 40

spray_cooldown: 30
spray_cd: 30
# |喷漆的冷却时间 (秒)
# |Cooldown of spraying (Second)
# 默认|Default: 30

big_spray_cooldown_multiple: 1.5
# big_spray_cooldown == spray_cooldown * big_spray_cooldown_multiple
# |大喷漆的冷却时间倍数 (upload_cooldown的倍数)
# |Multiple number of big spray cooldown (Multiple of upload_cooldown)
# 默认|Default: 1.5
big_spray_cd_multiple: 1.25
# big_spray_cd = spray_cd * big_spray_cd_multiple
# |大喷漆的冷却时间倍数 (spray_cd的倍数)
# |Multiple number of big spray cooldown (Multiple of spray_cd)
# 默认|Default: 1.25


upload_cooldown: 60
upload_cd: 60
# |上传图片的冷却时间 (秒)
# |Cooldown between uploading an image (Second)
# 默认|Default: 60

upload_failed_cooldown_multiple: 0.2
# upload_failed_cooldown == upload_cooldown * upload_failed_cooldown_multiple
# |上传图片失败时的冷却时间倍数 (upload_cooldown的倍数)
# |Multiple number of cooldown when failed to upload an image (Multiple of upload_cooldown)
upload_failed_cd_multiple: 0.2
# upload_failed_cd = upload_cd * upload_failed_cd_multiple
# |上传图片失败时的冷却时间倍数 (upload_cd的倍数)
# |Multiple number of cooldown when failed to upload an image (Multiple of upload_cd)
# 默认|Default: 0.2

copy_cooldown_multiple: 0.3
# copy_cooldown == upload_cooldown * copy_cooldown_multiple
# |玩家复制另一个玩家图片的冷却时间倍数 (upload_cooldown的倍数)
# |Multiple of cooldown when player copy an image from another player (Multiple of upload_cooldown)
copy_cd_multiple: 0.3
# copy_cd = upload_cd * copy_cd_multiple
# |玩家复制另一个玩家图片的冷却时间倍数 (upload_cd的倍数)
# |Multiple of cooldown when player copy an image from another player (Multiple of upload_cd)
# 默认|Default: 0.3


Expand Down Expand Up @@ -369,6 +369,6 @@ Messages:



# |Checking compatibility, take care of this (✿◕‿◕✿)
# |Checking compatibility, don't touch this (✿◕‿◕✿)
# |检测配置兼容性,别乱改喔 (づ ̄3 ̄)づ
configVersion: 1.71
configVersion: 1.8
2 changes: 1 addition & 1 deletion src/fun/LSDog/CustomSprays/CustomSprays.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

public class CustomSprays extends JavaPlugin {

public static final double CONFIG_VERSION = 1.71;
public static final double CONFIG_VERSION = 1.8;
public static CustomSprays plugin;

public static String prefix = "§3§lCustomSprays >>§r ";
Expand Down
6 changes: 3 additions & 3 deletions src/fun/LSDog/CustomSprays/command/CommandCustomSprays.java
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void run() {

uploadingSet.add(player.getUniqueId());
/* 上传失败了就缩短冷却时间,所谓人性化是也~~ */
CoolDown.setUploadCdMultiple(player, CustomSprays.plugin.getConfig().getDouble("upload_failed_cooldown_multiple"));
CoolDown.setUploadCdMultiple(player, CustomSprays.plugin.getConfig().getDouble("upload_failed_cd_multiple"));

if (args.length == 1) {
player.sendMessage(CustomSprays.prefix + DataManager.getMsg(player, "COMMAND_UPLOAD.NO_URL"));
Expand Down Expand Up @@ -234,7 +234,7 @@ public void run() {
return;
}
DataManager.saveImageBytes(player, data);
CoolDown.setUploadCdMultiple(player, CustomSprays.plugin.getConfig().getDouble("copy_cooldown_multiple"));
CoolDown.setUploadCdMultiple(player, CustomSprays.plugin.getConfig().getDouble("copy_cd_multiple"));
sender.sendMessage(CustomSprays.prefix + "OK!" + (player.isOp()&&!allow?" §7§l(OP-bypass)":"") );
}
}
Expand Down Expand Up @@ -287,7 +287,7 @@ public void run() {
NMS.sendPacket(player, packet);
}
} else NMS.sendPacket(player, MapFrameFactory.getMapPacket(id, imageBytes));
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
// Send original mapview back
Expand Down
6 changes: 3 additions & 3 deletions src/fun/LSDog/CustomSprays/data/DataManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static String getMsg(CommandSender sender, String path) {
return ChatColor.translateAlternateColorCodes('&', CustomSprays.plugin.getConfig().getString("Messages."+path));
}

public static byte[] getSizedImageBytes(Player player, int width, int hight) {
public static byte[] getSizedImageBytes(Player player, int width, int height) {

byte[] bytes384 = data.getImageBytes(player);
if (bytes384 == null || bytes384.length != 147456) {
Expand All @@ -83,9 +83,9 @@ public static byte[] getSizedImageBytes(Player player, int width, int hight) {
}
image384.setRGB(0, 0, 384, 384, intColorArray, 0, 384);

BufferedImage imageSized = new BufferedImage(width, hight, BufferedImage.TYPE_INT_ARGB_PRE);
BufferedImage imageSized = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics2D graphics2D = imageSized.createGraphics();
graphics2D.drawImage(image384, 0, 0, width, hight, null);
graphics2D.drawImage(image384, 0, 0, width, height, null);
graphics2D.dispose();

byte[] bytes;
Expand Down
4 changes: 2 additions & 2 deletions src/fun/LSDog/CustomSprays/data/DataYml.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public DataYml() throws IOException {
}

/**
* 都是384*384大小
* @param imgBytes byte[384*384]{MinecraftColorBytes}
*/
@Override
public int saveImageBytes(Player player, byte[] imgBytes) {
Expand All @@ -51,7 +51,7 @@ public int saveImageBytes(Player player, byte[] imgBytes) {
}

/**
* 都是384*384大小
* @return byte[384*384]{MinecraftColorBytes}
*/
@Override
public byte[] getImageBytes(Player player) {
Expand Down
2 changes: 1 addition & 1 deletion src/fun/LSDog/CustomSprays/spray/SprayManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static boolean spray(Player player, boolean isBigSpray) {
SprayBase spray = new SprayBig(player, length, bytes, Bukkit.getOnlinePlayers());
result = spray.create((long) (CustomSprays.plugin.getConfig().getDouble("destroy")*20L));
if (result) {
CoolDown.setSprayCdMultiple(player, CustomSprays.plugin.getConfig().getDouble("big_spray_cooldown_multiple"));
CoolDown.setSprayCdMultiple(player, CustomSprays.plugin.getConfig().getDouble("big_spray_cd_multiple"));
CustomSprays.debug("§f§l" + player.getName() + "§b spray §7->§r " + spray.location.getX() + " " + spray.location.getY() + " " + spray.location.getZ() + " (big)");
}

Expand Down
4 changes: 2 additions & 2 deletions src/fun/LSDog/CustomSprays/util/CoolDown.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static void setSprayCd(Player player, long millisecond) {
}

public static void setSprayCdMultiple(Player player, double multiple) {
setSprayCd(player, Math.round(CustomSprays.plugin.getConfig().getDouble("spray_cooldown")*multiple*1000));
setSprayCd(player, Math.round(CustomSprays.plugin.getConfig().getDouble("spray_cd")*multiple*1000));
}

public static boolean isSprayInCd(Player player) {
Expand Down Expand Up @@ -56,7 +56,7 @@ public static void setUploadCd(Player player, long millisecond) {
}

public static void setUploadCdMultiple(Player player, double multiple) {
setUploadCd(player, Math.round(CustomSprays.plugin.getConfig().getDouble("upload_cooldown")*multiple*1000));
setUploadCd(player, Math.round(CustomSprays.plugin.getConfig().getDouble("upload_cd")*multiple*1000));
}

public static boolean isUploadInCd(Player player) {
Expand Down

0 comments on commit 416e452

Please sign in to comment.