Skip to content

Commit 755a5d8

Browse files
committed
feat: make resourcepack optional
1 parent 1bc9fab commit 755a5d8

5 files changed

Lines changed: 7 additions & 122 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

run/plugins/viaversion/config.yml

Lines changed: 0 additions & 115 deletions
This file was deleted.

src/main/java/dev/emortal/velocity/lang/ChatMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public interface ChatMessages {
464464

465465
Args0 RESOURCE_PACK_DOWNLOAD = () -> Component.text("We love you");
466466
Args0 RESOURCE_PACK_DECLINED = () -> Component.text().color(NamedTextColor.GRAY)
467-
.append(Component.text("Using the resource pack is required. It isn't big and only has to be downloaded once.")).appendNewline()
467+
.append(Component.text("Using the resource pack is heavily recommended. It isn't big and only has to be downloaded once.")).appendNewline()
468468
.append(Component.text("If the dialog is annoying, you can enable 'Server Resource Packs' when adding the server and the prompt will disappear."))
469469
.build();
470470
Args0 RESOURCE_PACK_FAILED = () -> Component.text().color(NamedTextColor.RED)

src/main/java/dev/emortal/velocity/misc/listener/CoreListenersModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public boolean onLoad() {
2929
eventManager.register(new TabList(scheduler, super.adapters().playerProvider(), playerTracker));
3030

3131
// resource pack
32-
eventManager.register(new ResourcePackForcer(super.adapters().resourcePackProvider(), scheduler));
32+
eventManager.register(new ResourcePackSender(super.adapters().resourcePackProvider(), scheduler));
3333

3434
// fuck lunar
3535
eventManager.register(new LunarKicker());

src/main/java/dev/emortal/velocity/misc/listener/ResourcePackForcer.java renamed to src/main/java/dev/emortal/velocity/misc/listener/ResourcePackSender.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
import java.security.NoSuchAlgorithmException;
2020
import java.util.concurrent.TimeUnit;
2121

22-
final class ResourcePackForcer {
23-
private static final Logger LOGGER = LoggerFactory.getLogger(ResourcePackForcer.class);
22+
final class ResourcePackSender {
23+
private static final Logger LOGGER = LoggerFactory.getLogger(ResourcePackSender.class);
2424

2525
private static final String PACK_URL = "https://github.com/emortalmc/Resourcepack/releases/download/latest/pack.zip";
2626

2727
private ResourcePackInfo resourcePackInfo;
2828

29-
ResourcePackForcer(@NotNull ResourcePackProvider resourcePackProvider, @NotNull EmortalScheduler scheduler) {
29+
ResourcePackSender(@NotNull ResourcePackProvider resourcePackProvider, @NotNull EmortalScheduler scheduler) {
3030
this.updateResourcePackInfo(resourcePackProvider);
3131
scheduler.repeat(() -> this.updateResourcePackInfo(resourcePackProvider), 30, TimeUnit.SECONDS);
3232
}
@@ -40,7 +40,7 @@ private void updateResourcePackInfo(@NotNull ResourcePackProvider resourcePackPr
4040
return;
4141
}
4242

43-
this.resourcePackInfo = resourcePackProvider.createResourcePack(PACK_URL, sha1, ChatMessages.RESOURCE_PACK_DOWNLOAD.get(), true);
43+
this.resourcePackInfo = resourcePackProvider.createResourcePack(PACK_URL, sha1, ChatMessages.RESOURCE_PACK_DOWNLOAD.get(), false);
4444
LOGGER.info("Update resource pack info with hash {}", byteArrayToHexString(sha1));
4545
}
4646

0 commit comments

Comments
 (0)