diff --git a/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java b/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java index c71044f..ce77b84 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java @@ -421,7 +421,7 @@ public abstract class AbstractCNPlayer implements CNPlayer { @Override public Set getTrackedPassengerIds(CNPlayer another) { - return Optional.ofNullable(trackers.get(another)).map(tracker -> new HashSet<>(tracker.getPassengerIDs())).orElse(new HashSet<>()); + return Optional.ofNullable(trackers.get(another)).map(Tracker::getPassengerIDs).orElse(new HashSet<>()); } @Override diff --git a/api/src/main/java/net/momirealms/customnameplates/api/helper/AdventureHelper.java b/api/src/main/java/net/momirealms/customnameplates/api/helper/AdventureHelper.java index c8ff0a3..ff320f6 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/helper/AdventureHelper.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/helper/AdventureHelper.java @@ -209,6 +209,10 @@ public class AdventureHelper { return "<#FFFEFD>" + text + ""; } + public static String removeShadow(String text) { + return "<#F0F0F0>" + text + ""; + } + /** * Surrounds text with a MiniMessage font tag. * diff --git a/api/src/main/java/net/momirealms/customnameplates/api/network/Tracker.java b/api/src/main/java/net/momirealms/customnameplates/api/network/Tracker.java index 9bcc288..786fbbd 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/network/Tracker.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/network/Tracker.java @@ -19,9 +19,8 @@ package net.momirealms.customnameplates.api.network; import net.momirealms.customnameplates.api.CNPlayer; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; public class Tracker { @@ -29,7 +28,7 @@ public class Tracker { private double scale; private final CNPlayer tracker; - private final Set passengerIDs = Collections.synchronizedSet(new HashSet<>()); + private final CopyOnWriteArrayList passengerIDs = new CopyOnWriteArrayList<>(); /** * Constructs a new Tracker for the specified player. @@ -63,15 +62,15 @@ public class Tracker { } public void addPassengerID(int passengerID) { - passengerIDs.add(passengerID); + this.passengerIDs.add(passengerID); } public void removePassengerID(int passengerID) { - passengerIDs.remove(passengerID); + this.passengerIDs.remove((Object) passengerID); } public Set getPassengerIDs() { - return passengerIDs; + return new HashSet<>(passengerIDs); } public boolean isEmpty() { diff --git a/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/AdaptiveImageText.java b/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/AdaptiveImageText.java index 9631083..2336b4e 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/AdaptiveImageText.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/AdaptiveImageText.java @@ -31,23 +31,25 @@ public class AdaptiveImageText { private final String id; private final String text; private final T t; - private final boolean removeShadow; + private final boolean removeShadowOld; + private final boolean removeShadowNew; private final PreParsedDynamicText preParsedDynamicText; private final int leftMargin; private final int rightMargin; - public AdaptiveImageText(String id, String text, T t, boolean removeShadow, int leftMargin, int rightMargin) { + public AdaptiveImageText(String id, String text, T t, boolean removeShadowOld, boolean removeShadowNew, int rightMargin, int leftMargin) { this.text = text; this.id = id; this.t = t; - this.removeShadow = removeShadow; + this.removeShadowOld = removeShadowOld; + this.removeShadowNew = removeShadowNew; this.preParsedDynamicText = new PreParsedDynamicText(text); this.leftMargin = leftMargin; this.rightMargin = rightMargin; } - public static AdaptiveImageText create(String id, final String text, final T t, final boolean removeShadow, int leftMargin, int rightMargin) { - return new AdaptiveImageText<>(id, text, t, removeShadow, leftMargin, rightMargin); + public static AdaptiveImageText create(String id, final String text, final T t, final boolean removeShadowOld, final boolean removeShadowNew, int leftMargin, int rightMargin) { + return new AdaptiveImageText<>(id, text, t, removeShadowOld, removeShadowNew, rightMargin, leftMargin); } public PreParsedDynamicText getPreParsedDynamicText() { @@ -71,8 +73,13 @@ public class AdaptiveImageText { String suffix = t.createImageSuffix(advance, leftMargin, rightMargin); String prefixWithFont = AdventureHelper.surroundWithNameplatesFont(prefix); String suffixWithFont = AdventureHelper.surroundWithNameplatesFont(suffix); - if (removeShadow) prefixWithFont = AdventureHelper.removeShadowTricky(prefixWithFont); - if (removeShadow) suffixWithFont = AdventureHelper.removeShadowTricky(suffixWithFont); + if (removeShadowOld) { + prefixWithFont = AdventureHelper.removeShadowTricky(prefixWithFont); + suffixWithFont = AdventureHelper.removeShadowTricky(suffixWithFont); + } else if (removeShadowNew) { + prefixWithFont = AdventureHelper.removeShadow(prefixWithFont); + suffixWithFont = AdventureHelper.removeShadow(suffixWithFont); + } return prefixWithFont + parsed + suffixWithFont; } @@ -83,7 +90,8 @@ public class AdaptiveImageText { float advance = CustomNameplates.getInstance().getAdvanceManager().getLineAdvance(parsed); String image = t.createImage(advance, leftMargin, rightMargin); String imageWithFont = AdventureHelper.surroundWithNameplatesFont(image); - if (removeShadow) imageWithFont = AdventureHelper.removeShadowTricky(imageWithFont); + if (removeShadowOld) imageWithFont = AdventureHelper.removeShadowTricky(imageWithFont); + else if (removeShadowNew) imageWithFont = AdventureHelper.removeShadow(imageWithFont); return imageWithFont; } diff --git a/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/VanillaHud.java b/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/VanillaHud.java index 0191c8b..59b55c8 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/VanillaHud.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/placeholder/internal/VanillaHud.java @@ -34,13 +34,11 @@ public class VanillaHud { private final boolean reverse; private final PreParsedDynamicText current; private final PreParsedDynamicText max; - private final boolean removeShadow; - public VanillaHud(Image empty, Image half, Image full, boolean reverse, String current, String max, boolean removeShadow) { + public VanillaHud(Image empty, Image half, Image full, boolean reverse, String current, String max) { this.empty = String.valueOf(empty.character().character()) + OffsetFont.NEG_2.character(); this.half = String.valueOf(half.character().character()) + OffsetFont.NEG_2.character(); this.full = String.valueOf(full.character().character()) + OffsetFont.NEG_2.character(); - this.removeShadow = removeShadow; this.reverse = reverse; this.current = new PreParsedDynamicText(current); this.max = new PreParsedDynamicText(max); @@ -95,7 +93,6 @@ public class VanillaHud { .append(String.valueOf(half).repeat(half_amount)) .append(String.valueOf(empty).repeat(empty_amount)); } - return removeShadow ? AdventureHelper.removeShadowTricky(AdventureHelper.surroundWithNameplatesFont(builder.toString())) : - AdventureHelper.surroundWithNameplatesFont(builder.toString()); + return AdventureHelper.surroundWithNameplatesFont(builder.toString()); } } diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java index f428136..e7427e1 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java @@ -487,41 +487,39 @@ public class ResourcePackManagerImpl implements ResourcePackManager { public static final String Nameplates_Shader_1_20_5 = "if (Color.xyz == vec3(255., 254., 253.) / 255.) {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + " vertex.y += 1;\n" + " vertex.x += 1;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + - " } else if (Color.xyz == vec3(254., 254., 254.) / 255.) {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + - " vertex.z *= 1.001;\n" + - " vertex.x *= 1.001;\n" + + " } else if (Color.xyz == vec3(240., 240., 240.) / 255.) {\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertexColor.rgb = texelFetch(Sampler2, UV2 / 16, 0).rgb;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + - " } else if (Color.xyz == vec3(253., 254., 254.) / 255.) {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + - " vertex.z *= 1.001001;\n" + - " vertex.x *= 1.001001;\n" + + " } else if (Color.xyz == vec3(60., 60., 60.) / 255.) {\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + + " depthLevel = 114514.0;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " } else {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " }"; public static final String Nameplates_Shader_1_20_4 = "if (Color.xyz == vec3(255., 254., 253.) / 255.) {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + " vertex.y += 1;\n" + " vertex.x += 1;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + - " } else if (Color.xyz == vec3(254., 254., 254.) / 255.) {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + - " vertex.z -= 0.001;\n" + + " } else if (Color.xyz == vec3(240., 240., 240.) / 255.) {\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertexColor.rgb = texelFetch(Sampler2, UV2 / 16, 0).rgb;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + - " } else if (Color.xyz == vec3(253., 254., 254.) / 255.) {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + - " vertex.z -= 0.0011;\n" + + " } else if (Color.xyz == vec3(60., 60., 60.) / 255.) {\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + + " depthLevel = 114514.0;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " } else {\n" + - " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " }"; diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java index 24a627b..ec54c3f 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java @@ -179,6 +179,22 @@ public class PlaceholderManagerImpl implements PlaceholderManager { }); this.registerSharedPlaceholder("%shared_np_is-latest%", () -> String.valueOf(plugin.isUpToDate())); this.registerPlayerPlaceholder("%np_is-latest%", (player) -> String.valueOf(plugin.isUpToDate())); + for (int i = 1; i <= 20; i++) { + int speed = i; + this.registerPlayerPlaceholder("%np_gradient_" + i + "%", (player) -> { + int currentTicks = MainTask.getTicks(); + double progress = currentTicks * 0.01 * speed; + return String.format("%.2f", -1 + (progress % 2.0001)); + }); + } + for (int i = 1; i <= 20; i++) { + int speed = i; + this.registerPlayerPlaceholder("%np_gradient_" + i + "%", (player) -> { + int currentTicks = MainTask.getTicks(); + double progress = currentTicks * 0.01 * speed; + return String.format("%.2f", -1 + (progress % 2.0001)); + }); + } this.registerPlayerPlaceholder("%np_time%", (player) -> { long time = player.playerTime() % 24_000; String ap = time >= 6000 && time < 18000 ? " PM" : " AM"; @@ -284,8 +300,7 @@ public class PlaceholderManagerImpl implements PlaceholderManager { Image full = requireNonNull(plugin.getImageManager().imageById(inner.getString("images.full")), "image.full should not be null"); String currentValue = section.getString("placeholder.value", "1"); String maxValue = section.getString("placeholder.max-value", currentValue); - boolean removeShadow = section.getBoolean("remove-shadow", false); - VanillaHud vanillaHud = new VanillaHud(empty, half, full, reverse, currentValue, maxValue, removeShadow); + VanillaHud vanillaHud = new VanillaHud(empty, half, full, reverse, currentValue, maxValue); List list = List.of(vanillaHud.getCurrent(), vanillaHud.getMax()); Placeholder placeholder1 = registerSharedPlaceholder("%shared_np_vanilla_" + id + "%", vanillaHud::create); Placeholder placeholder2 = registerPlayerPlaceholder("%np_vanilla_" + id + "%", vanillaHud::create); @@ -349,7 +364,7 @@ public class PlaceholderManagerImpl implements PlaceholderManager { Bubble bubble = plugin.getBubbleManager().bubbleById(bbID); if (bubble != null) { AdaptiveImageText adaptiveImageText = AdaptiveImageText.create( - id, inner.getString("text"), bubble, inner.getBoolean("remove-shadow"), + id, inner.getString("text"), bubble, inner.getBoolean("remove-shadow"), !inner.getBoolean("shadow", false), inner.getInt("left-margin", 1), inner.getInt("right-margin", 1) ); List list = new ArrayList<>(); @@ -387,7 +402,7 @@ public class PlaceholderManagerImpl implements PlaceholderManager { Nameplate nameplate = plugin.getNameplateManager().nameplateById(npID); if (nameplate != null) { AdaptiveImageText adaptiveImageText = AdaptiveImageText.create( - id, inner.getString("text"), nameplate, inner.getBoolean("remove-shadow"), + id, inner.getString("text"), nameplate, inner.getBoolean("remove-shadow"), !inner.getBoolean("shadow", false), inner.getInt("left-margin", 1), inner.getInt("right-margin", 1) ); List list = new ArrayList<>(); @@ -425,8 +440,8 @@ public class PlaceholderManagerImpl implements PlaceholderManager { Background background = plugin.getBackgroundManager().backgroundById(bgID); if (background != null) { AdaptiveImageText adaptiveImageText = AdaptiveImageText.create( - id, inner.getString("text"), background, inner.getBoolean("remove-shadow"), - inner.getInt("left-margin", 2), inner.getInt("right-margin", 0) + id, inner.getString("text"), background, inner.getBoolean("remove-shadow"), !inner.getBoolean("shadow", false), + inner.getInt("left-margin", 1), inner.getInt("right-margin", 1) ); List list = new ArrayList<>(); list.add(adaptiveImageText.getPreParsedDynamicText()); diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/storage/StorageManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/storage/StorageManagerImpl.java index b6e3bae..216bfb7 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/storage/StorageManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/storage/StorageManagerImpl.java @@ -52,8 +52,8 @@ public class StorageManagerImpl implements StorageManager, JoinQuitListener { this.redisManager.getPlayerData(uuid, async).thenAccept(playerData1 -> { if (playerData1.isPresent()) { PlayerData data = playerData1.get(); - handleDataLoad(player, data); ((AbstractCNPlayer) player).setLoaded(true); + handleDataLoad(player, data); plugin.getEventManager().dispatch(DataLoadEvent.class, data); this.redisManager.updatePlayerData(data, async).thenAccept(result -> { if (!result) { @@ -64,8 +64,8 @@ public class StorageManagerImpl implements StorageManager, JoinQuitListener { this.dataSource().getPlayerData(uuid, async).thenAccept(playerData2 -> { if (playerData2.isPresent()) { PlayerData data = playerData2.get(); - handleDataLoad(player, data); ((AbstractCNPlayer) player).setLoaded(true); + handleDataLoad(player, data); plugin.getEventManager().dispatch(DataLoadEvent.class, data); this.redisManager.updatePlayerData(data, async).thenAccept(result -> { if (!result) { @@ -82,8 +82,8 @@ public class StorageManagerImpl implements StorageManager, JoinQuitListener { this.dataSource().getPlayerData(uuid, async).thenAccept(playerData -> { if (playerData.isPresent()) { PlayerData data = playerData.get(); - handleDataLoad(player, data); ((AbstractCNPlayer) player).setLoaded(true); + handleDataLoad(player, data); } else { plugin.getPluginLogger().warn("Failed to load player data for " + player.name()); } diff --git a/backend/src/main/resources/ResourcePack/assets/minecraft/shaders/core/rendertype_text.fsh b/backend/src/main/resources/ResourcePack/assets/minecraft/shaders/core/rendertype_text.fsh index a3e3b84..308fb3f 100644 --- a/backend/src/main/resources/ResourcePack/assets/minecraft/shaders/core/rendertype_text.fsh +++ b/backend/src/main/resources/ResourcePack/assets/minecraft/shaders/core/rendertype_text.fsh @@ -20,8 +20,15 @@ void main() { if (color.a < 0.1) { discard; } + if (depthLevel == 114514.0) { + discard; + } if (texColor.a == 254.0/255.0) { - if (depthLevel == 0.00) { + if (depthLevel == 0.0 + || depthLevel == 100 + || depthLevel == 200 + || depthLevel == 400 + ) { discard; } else { color = vec4(texColor.rgb, 1.0) * vertexColor * ColorModulator; diff --git a/backend/src/main/resources/ResourcePack/overlay_1_20_5/assets/minecraft/shaders/core/rendertype_text.fsh b/backend/src/main/resources/ResourcePack/overlay_1_20_5/assets/minecraft/shaders/core/rendertype_text.fsh index 1736129..2d15cd1 100644 --- a/backend/src/main/resources/ResourcePack/overlay_1_20_5/assets/minecraft/shaders/core/rendertype_text.fsh +++ b/backend/src/main/resources/ResourcePack/overlay_1_20_5/assets/minecraft/shaders/core/rendertype_text.fsh @@ -20,8 +20,19 @@ void main() { if (color.a < 0.1) { discard; } + if (depthLevel == 114514.0) { + discard; + } if (texColor.a == 254.0/255.0) { - if (depthLevel == 1000.00) { + if (depthLevel == 1000.0 + || depthLevel == 2200 + || depthLevel == 50 + || depthLevel == 2650 + || depthLevel == 200 + || depthLevel == 400 + || depthLevel == 2800 + || depthLevel == 2400 + ) { discard; } else { color = vec4(texColor.rgb, 1.0) * vertexColor * ColorModulator; diff --git a/backend/src/main/resources/config.yml b/backend/src/main/resources/config.yml index 7139595..9a97e10 100644 --- a/backend/src/main/resources/config.yml +++ b/backend/src/main/resources/config.yml @@ -56,7 +56,7 @@ resource-pack: shader: # Enables shader generation enable: true - # Hides scoreboard numbers + # Hides scoreboard numbers (1.20.4- requires shader to remove that) hide-scoreboard-number: false # Enables support for animated text shaders animated-text: false diff --git a/backend/src/main/resources/configs/custom-placeholders.yml b/backend/src/main/resources/configs/custom-placeholders.yml index a185913..c9508c7 100644 --- a/backend/src/main/resources/configs/custom-placeholders.yml +++ b/backend/src/main/resources/configs/custom-placeholders.yml @@ -39,33 +39,47 @@ nameplate-text: halloween: nameplate: halloween text: 'Today is Halloween! Trick or treat!' + left-margin: 1 + right-margin: 1 # https://mo-mi.gitbook.io/xiaomomi-plugins/plugin-wiki/customnameplates/custom-placeholders/background-text background-text: location: background: bedrock_1 text: '%np_image_compass% %np_shift_location%' - remove-shadow: true + shadow: false + left-margin: 1 + right-margin: 1 time: background: bedrock_1 text: '%np_image_clock% %np_shift_time%' - remove-shadow: true + shadow: false + left-margin: 1 + right-margin: 1 weather: background: bedrock_1 text: '%np_image_weather% %np_shift_weather%' - remove-shadow: true + shadow: false + left-margin: 1 + right-margin: 1 hello: background: bedrock_1 text: '%np_image_bubble% %np_shift_hello%' - remove-shadow: true + shadow: false + left-margin: 1 + right-margin: 1 update: background: bedrock_1 text: '%np_image_bell% %np_shift_update%' - remove-shadow: true + shadow: false + left-margin: 1 + right-margin: 1 other_actionbar: background: bedrock_2 text: '%np_actionbar%' - remove-shadow: true + shadow: false + left-margin: 1 + right-margin: 1 # https://mo-mi.gitbook.io/xiaomomi-plugins/plugin-wiki/customnameplates/custom-placeholders/static-text static-text: @@ -104,6 +118,34 @@ shift-text: # https://mo-mi.gitbook.io/xiaomomi-plugins/plugin-wiki/customnameplates/custom-placeholders/switch-text switch-text: + nameplate_color_prefix: + switch: "%np_equipped_nameplate%" + default: "" + case: + 'wither': "" + 'halloween': "" + 'hutao': "" + 'rabbit': "" + 'starsky': "" + 'trident': "" + 'cheems': "" + 'egg': "" + 'cat': "" + 'xmas': "" + nameplate_color_suffix: + switch: "%np_equipped_nameplate%" + default: "" + case: + 'wither': "" + 'halloween': "" + 'hutao': "" + 'rabbit': "" + 'starsky': "" + 'trident': "" + 'cheems': "" + 'egg': "" + 'cat': "" + 'xmas': "" world: switch: '%player_world%' case: diff --git a/backend/src/main/resources/configs/nameplate.yml b/backend/src/main/resources/configs/nameplate.yml index da12535..b5dd8af 100644 --- a/backend/src/main/resources/configs/nameplate.yml +++ b/backend/src/main/resources/configs/nameplate.yml @@ -11,13 +11,13 @@ always-show: false nameplate: # Prefix to be displayed before the player's name. # The prefix here will become part of the nameplate - prefix: '' + prefix: '%np_switch_nameplate_color_prefix%' # Placeholder for the player's name # The default configuration uses shift to ensure that the player name not affected by the clientside `force-unicode-font` setting. player-name: '%np_shift_player_name%' # Suffix to be displayed after the player's name. # The suffix here will become part of the nameplate - suffix: '' + suffix: '%np_switch_nameplate_color_suffix%' # Configuration for Unlimited tags. unlimited: diff --git a/backend/src/main/resources/contents/backgrounds/b0.png b/backend/src/main/resources/contents/backgrounds/b0.png index 1130ab3..f9bec4b 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b0.png and b/backend/src/main/resources/contents/backgrounds/b0.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b1.png b/backend/src/main/resources/contents/backgrounds/b1.png index ae76d6a..f64fd9a 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b1.png and b/backend/src/main/resources/contents/backgrounds/b1.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b128.png b/backend/src/main/resources/contents/backgrounds/b128.png index 7a4c1ad..ef8b820 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b128.png and b/backend/src/main/resources/contents/backgrounds/b128.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b16.png b/backend/src/main/resources/contents/backgrounds/b16.png index 83d0f34..f4f2e93 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b16.png and b/backend/src/main/resources/contents/backgrounds/b16.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b2.png b/backend/src/main/resources/contents/backgrounds/b2.png index 9daf46c..b2fdf7e 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b2.png and b/backend/src/main/resources/contents/backgrounds/b2.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b32.png b/backend/src/main/resources/contents/backgrounds/b32.png index 31ce74f..5a3c44a 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b32.png and b/backend/src/main/resources/contents/backgrounds/b32.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b4.png b/backend/src/main/resources/contents/backgrounds/b4.png index 0532849..0c30d02 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b4.png and b/backend/src/main/resources/contents/backgrounds/b4.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b64.png b/backend/src/main/resources/contents/backgrounds/b64.png index 9188308..89a48f4 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b64.png and b/backend/src/main/resources/contents/backgrounds/b64.png differ diff --git a/backend/src/main/resources/contents/backgrounds/b8.png b/backend/src/main/resources/contents/backgrounds/b8.png index 87d0de7..03bf265 100644 Binary files a/backend/src/main/resources/contents/backgrounds/b8.png and b/backend/src/main/resources/contents/backgrounds/b8.png differ diff --git a/backend/src/main/resources/contents/backgrounds/bedrock_1.yml b/backend/src/main/resources/contents/backgrounds/bedrock_1.yml index 304e825..81134b8 100644 --- a/backend/src/main/resources/contents/backgrounds/bedrock_1.yml +++ b/backend/src/main/resources/contents/backgrounds/bedrock_1.yml @@ -1,16 +1,16 @@ left: image: b0 height: 14 - ascent: 7 + ascent: 6 right: image: b0 height: 14 - ascent: 7 + ascent: 6 middle: height: 14 - ascent: 7 + ascent: 6 1: b1 2: b2 4: b4 diff --git a/backend/src/main/resources/contents/backgrounds/bedrock_2.yml b/backend/src/main/resources/contents/backgrounds/bedrock_2.yml index cdc9017..dde917c 100644 --- a/backend/src/main/resources/contents/backgrounds/bedrock_2.yml +++ b/backend/src/main/resources/contents/backgrounds/bedrock_2.yml @@ -1,16 +1,16 @@ left: image: b0 height: 14 - ascent: 12 + ascent: 11 right: image: b0 height: 14 - ascent: 12 + ascent: 11 middle: height: 14 - ascent: 12 + ascent: 11 1: b1 2: b2 4: b4 diff --git a/gradle.properties b/gradle.properties index 02658e5..8c47989 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.0.0 +project_version=3.0.0-beta-1 config_version=36 project_group=net.momirealms