Merge pull request #617 from IronApollo/vault-fix

Fix vault, remove 1.14 and DummyFawe
This commit is contained in:
NotMyFault
2020-09-16 18:06:57 +02:00
committed by GitHub
22 changed files with 32 additions and 26016 deletions

View File

@ -53,12 +53,12 @@ public final class Constants {
public static final int DATA_VERSION_MC_1_13_2 = 1631;
/**
* The DataVersion for Minecraft 1.16
* The DataVersion for Minecraft 1.14
*/
public static final int DATA_VERSION_MC_1_14 = 1952;
/**
* The DataVersion for Minecraft 1.16
* The DataVersion for Minecraft 1.15
*/
public static final int DATA_VERSION_MC_1_15 = 2225;

View File

@ -100,8 +100,6 @@ public final class BundledBlockData {
url = resourceLoader.getResource(BundledBlockData.class, "blocks.116.json");
} else if (dataVersion >= Constants.DATA_VERSION_MC_1_15) {
url = resourceLoader.getResource(BundledBlockData.class, "blocks.115.json");
} else if (dataVersion >= Constants.DATA_VERSION_MC_1_14) {
url = resourceLoader.getResource(BundledBlockData.class, "blocks.114.json");
}
if (url == null) {
url = resourceLoader.getResource(BundledBlockData.class, "blocks.json");

View File

@ -87,8 +87,6 @@ public final class BundledItemData {
url = resourceLoader.getResource(BundledBlockData.class, "items.116.json");
} else if (dataVersion >= Constants.DATA_VERSION_MC_1_15) {
url = resourceLoader.getResource(BundledBlockData.class, "items.115.json");
} else if (dataVersion >= Constants.DATA_VERSION_MC_1_14) {
url = resourceLoader.getResource(BundledBlockData.class, "items.114.json");
}
if (url == null) {
url = resourceLoader.getResource(BundledBlockData.class, "items.json");