Skip to content

The fisher guy patch 3 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheFisherGuy wants to merge 6 commits into
base: patch-9
Choose a base branch
from
Open

The fisher guy patch 3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2636110
Update uk_ua.json
TheFisherGuy Aug 6, 2024
4d53e5e
Merge pull request #988 from TheFisherGuy/patch-5
LtxProgrammer Aug 6, 2024
e108b40
Fixed #989
LtxProgrammer Aug 6, 2024
db6c6e1
Merge remote-tracking branch 'origin/master'
LtxProgrammer Aug 6, 2024
fc3a945
Create be_by
TheFisherGuy Aug 7, 2024
2708ca1
Update be_by
TheFisherGuy Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/net/ltxprogrammer/changed/Changed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ private void clientSetup(final FMLClientSetupEvent event) {

private void customPacks(final AddPackFindersEvent event) {
try {
event.addRepositorySource(new BuiltinRepositorySource(event.getPackType(), MODID));
switch (event.getPackType()) {
case CLIENT_RESOURCES, SERVER_DATA ->
event.addRepositorySource(new BuiltinRepositorySource(event.getPackType(), MODID));
default -> {}
}
} catch (Exception ex) {
LOGGER.error(ex);
}
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/net/ltxprogrammer/changed/data/BuiltinRepositorySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.ltxprogrammer.changed.data;

import kroppeb.stareval.Util;
import net.minecraft.server.packs.FolderPackResources;
import net.minecraft.server.packs.PackResources;
import net.minecraft.server.packs.PackType;
Expand All @@ -12,6 +13,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.EnumMap;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
Expand All @@ -26,17 +28,16 @@ public class BuiltinRepositorySource implements RepositorySource {
private final boolean isJar;
private final Set<String> packIds = new HashSet<>();
private final String packsFolder;
private static final String RESOURCEPACKS_FOLDER = "resourcepacks";
private static final String DATAPACKS_FOLDER = "datapacks";
private static final EnumMap<PackType, String> NAMED_FOLDERS = Util.make(new EnumMap<>(PackType.class), map -> {
map.put(PackType.CLIENT_RESOURCES, "resourcepacks");
map.put(PackType.SERVER_DATA, "datapacks");
});
private static final String MCMETA = "pack.mcmeta";

public BuiltinRepositorySource(PackType type, String modId) throws IOException, NullPointerException {
this.modId = modId;
this.modFile = FMLLoader.getLoadingModList().getModFileById(modId).getFile().getFilePath();
this.packsFolder = switch (type) {
case CLIENT_RESOURCES -> RESOURCEPACKS_FOLDER;
case SERVER_DATA -> DATAPACKS_FOLDER;
};
this.packsFolder = NAMED_FOLDERS.getOrDefault(type, type.getDirectory());
var file = this.modFile.toFile();
if (file.isDirectory()) {
this.isJar = false;
Expand Down
Loading