PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-04-01 01:05:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify bg pony skin loading (removes the need for a bgponies.json)

Browse source
This commit is contained in:
Sollace 2020-06-19 10:01:29 +02:00
parent 23d055aaa9
commit 7d2767d9f8
2 changed files with 8 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
src/main/java/com/minelittlepony/client/pony/BackgroundPonyList.java
View file

@ -1,147 +1,44 @@
package com.minelittlepony.client.pony; package com.minelittlepony.client.pony;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager; import net.minecraft.resource.ResourceManager;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.minelittlepony.api.pony.IPonyManager; import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.common.util.MoreStreams;
import com.minelittlepony.util.MathUtil; import com.minelittlepony.util.MathUtil;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Queue;
import java.util.UUID; import java.util.UUID;
/** /**
* All currently loaded background ponies. * All currently loaded background ponies.
*/ */
class BackgroundPonyList { class BackgroundPonyList {
private static final Gson GSON = new Gson();
private static final String BGPONIES_JSON = "textures/entity/pony/bgponies.json";
/** /**
* All currently loaded background ponies. * All currently loaded background ponies.
*/ */
private List<Identifier> backgroundPonyList = Lists.newArrayList(); private final List<Identifier> backgroundPonyList = new ArrayList<>();
public Identifier getId(UUID uuid) { public Identifier getId(UUID uuid) {
if (size() == 0 || isUser(uuid)) { if (backgroundPonyList.isEmpty() || isUser(uuid)) {
return IPonyManager.getDefaultSkin(uuid); return IPonyManager.getDefaultSkin(uuid);
} }
int bgi = MathUtil.mod(uuid.hashCode(), size()); int bgi = MathUtil.mod(uuid.hashCode(), backgroundPonyList.size());
return backgroundPonyList.get(bgi); return backgroundPonyList.get(bgi);
} }
public void reloadAll(ResourceManager resourceManager) { public void reloadAll(ResourceManager resourceManager) {
backgroundPonyList.clear(); backgroundPonyList.clear();
backgroundPonyList.addAll(resourceManager.findResources("textures/entity/pony", path -> path.endsWith(".png")));
List<Identifier> collectedPaths = new LinkedList<>(); MineLittlePony.logger.info("Detected {} background ponies installed.", backgroundPonyList.size());
List<BackgroundPonies> collectedPonies = new LinkedList<>();
Queue<BackgroundPonies> processingQueue = new LinkedList<>();
for (String domain : resourceManager.getAllNamespaces()) {
processingQueue.addAll(loadBgPonies(resourceManager, new Identifier(domain, BGPONIES_JSON)));
}
BackgroundPonies item;
while ((item = processingQueue.poll()) != null) {
for (Identifier imp : item.getImports()) {
if (!collectedPaths.contains(imp)) {
collectedPaths.add(imp);
processingQueue.addAll(loadBgPonies(resourceManager, imp));
}
}
collectedPonies.add(item);
}
for (BackgroundPonies i : collectedPonies) {
if (i.override) {
backgroundPonyList.clear();
}
backgroundPonyList.addAll(i.getPonies());
}
backgroundPonyList = MoreStreams.distinct(backgroundPonyList);
MineLittlePony.logger.info("Detected {} background ponies installed.", size());
} }
private boolean isUser(UUID uuid) {
private Queue<BackgroundPonies> loadBgPonies(ResourceManager resourceManager, Identifier location) { return MinecraftClient.getInstance().player != null
Queue<BackgroundPonies> collectedPonies = new LinkedList<>(); && MinecraftClient.getInstance().player.getUuid().equals(uuid);
try {
String path = location.getPath().replace("bgponies.json", "");
for (Resource res : resourceManager.getAllResources(location)) {
try (Reader reader = new InputStreamReader((res.getInputStream()))) {
BackgroundPonies ponies = GSON.fromJson(reader, BackgroundPonies.class);
ponies.domain = location.getNamespace();
ponies.path = path;
collectedPonies.add(ponies);
} catch (JsonParseException e) {
MineLittlePony.logger.error("Invalid bgponies.json in " + res.getResourcePackName(), e);
}
}
} catch (IOException ignored) {
// this isn't the exception you're looking for.
}
return collectedPonies;
}
private int size() {
return backgroundPonyList.size();
}
private static boolean isUser(UUID uuid) {
return MinecraftClient.getInstance().player != null && MinecraftClient.getInstance().player.getUuid().equals(uuid);
}
private static class BackgroundPonies {
private boolean override;
private List<String> ponies;
private List<String> imports = new ArrayList<>();
private String domain;
private String path;
private Identifier apply(String input) {
return new Identifier(domain, String.format("%s%s.png", path, input));
}
private Identifier makeImport(String input) {
return new Identifier(domain, String.format("%s%s/bgponies.json", path, input));
}
public List<Identifier> getPonies() {
return MoreStreams.map(ponies, this::apply);
}
public List<Identifier> getImports() {
return MoreStreams.map(imports, this::makeImport);
}
} }
} }

12
src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json
View file

@ -1,12 +0,0 @@
{
// Removes all of the previous resourcepack's ponies
"override": false,
// A list of sub-directories to include
// Pony textures are loaded according to subpath/bgponies.json
"imports": [],
// A list of all the pony names without the extension
// e.g. textures/entity/pony/bgpony_12.png
"ponies": [
"the_dude"
]
}