mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

2 Bug Fixes

Browse Source 
- Fixed #552 by making sure the biome saved in datapacks is all lowercase
- Fixed extra character showing when Iris downloads a pack
This commit is contained in:
StrangeOne101 2021-08-17 23:20:09 +12:00
parent d79af8fcc2
commit b55bf6e6c1
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java
View File

@ -228,7 +228,7 @@ public class NMSBinding17_1 implements INMSBinding {
@Override @Override
public Object getCustomBiomeBaseFor(String mckey) { public Object getCustomBiomeBaseFor(String mckey) {
try { try {
return getCustomBiomeRegistry().d(ResourceKey.a(IRegistry.aO, new MinecraftKey(mckey))); return getCustomBiomeRegistry().d(ResourceKey.a(IRegistry.aO, new MinecraftKey(mckey.toLowerCase())));
} catch (Throwable e) { } catch (Throwable e) {
Iris.reportError(e); Iris.reportError(e);
} }

2
src/main/java/com/volmit/iris/core/service/StudioSVC.java
View File

@ -189,7 +189,7 @@ public class StudioSVC implements IrisService {
public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException { public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException {
String url = "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch; String url = "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch;
sender.sendMessage("Downloading " + url); sender.sendMessage("Downloading " + url + " "); //The extra space stops a bug in adventure API from repeating the last letter of the URL
File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url); File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url);
File temp = Iris.getTemp(); File temp = Iris.getTemp();
File work = new File(temp, "dl-" + UUID.randomUUID()); File work = new File(temp, "dl-" + UUID.randomUUID());

4
src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustom.java
View File

@ -167,4 +167,8 @@ public class IrisBiomeCustom {
return 0; return 0;
} }
public String getId() {
return id.toLowerCase();
}
} }

4
src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java
View File

@ -472,14 +472,14 @@ public class IrisDimension extends IrisRegistrant {
boolean write = false; boolean write = false;
boolean changed = false; boolean changed = false;
IO.delete(new File(datapacks, "iris/data/" + getLoadKey())); IO.delete(new File(datapacks, "iris/data/" + getLoadKey().toLowerCase()));
for (IrisBiome i : getAllBiomes(data)) { for (IrisBiome i : getAllBiomes(data)) {
if (i.isCustom()) { if (i.isCustom()) {
write = true; write = true;
for (IrisBiomeCustom j : i.getCustomDerivitives()) { for (IrisBiomeCustom j : i.getCustomDerivitives()) {
File output = new File(datapacks, "iris/data/" + getLoadKey() + "/worldgen/biome/" + j.getId() + ".json"); File output = new File(datapacks, "iris/data/" + getLoadKey().toLowerCase() + "/worldgen/biome/" + j.getId() + ".json");
if (!output.exists()) { if (!output.exists()) {
changed = true; changed = true;