From 89832a6905007a21b3524b287bcdef2dd8d0cf67 Mon Sep 17 00:00:00 2001 From: 19MisterX98 <41451155+19MisterX98@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:46:12 +0200 Subject: [PATCH] update oresim (#268) --- build.gradle | 14 +++++------ src/main/java/anticope/rejects/utils/Ore.java | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 91e9d9f..f2989f1 100644 --- a/build.gradle +++ b/build.gradle @@ -33,13 +33,13 @@ dependencies { modImplementation "baritone:fabric:${project.minecraft_version}-SNAPSHOT" // seed .locate and ore sim - extraLibs('com.seedfinding:mc_math:0eb505174da8a92550f8ec6efe254e0fa936cc0d') { transitive = false } - extraLibs('com.seedfinding:mc_seed:5518e3ba3ee567fb0b51c15958967f70a6a19e02') { transitive = false } - extraLibs('com.seedfinding:mc_core:d685a37f0a466d4bf800e7f285daf9ef73c81678') { transitive = false } - extraLibs('com.seedfinding:mc_noise:a6ab8e6c688491829f8d2adf845392da22ef8e9c') { transitive = false } - extraLibs('com.seedfinding:mc_biome:b2271807a047bb43ac60c8c20ad47e315f19b9a6') { transitive = false } - extraLibs('com.seedfinding:mc_terrain:9e937ddb838e28e79423c287fa18b1ce66f061d7') { transitive = false } - extraLibs('com.seedfinding:mc_feature:c29fd1fcd746e14c1bcdb127da3113ba273db1fd') { transitive = false } + extraLibs('com.seedfinding:mc_math:ffd2edcfcc0d18147549c88cc7d8ec6cf21b5b91') { transitive = false } + extraLibs('com.seedfinding:mc_seed:1ead6fcefe7e8de4b3d60cd6c4e993f1e8f33409') { transitive = false } + extraLibs('com.seedfinding:mc_core:d64d5f90be66300da41ef58f4f1736db2499784f') { transitive = false } + extraLibs('com.seedfinding:mc_noise:7e3ba65e181796c4a2a1c8881d840b2254b92962') { transitive = false } + extraLibs('com.seedfinding:mc_biome:41a42cb9019a552598f12089059538853e18ec78') { transitive = false } + extraLibs('com.seedfinding:mc_terrain:b4246cbd5880c4f8745ccb90e1b102bde3448126') { transitive = false } + extraLibs('com.seedfinding:mc_feature:919b7e513cc1e87e029a9cd703fc4e2dc8686229') { transitive = false } // seedcracker api implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:2.10.1')) {transitive = false} diff --git a/src/main/java/anticope/rejects/utils/Ore.java b/src/main/java/anticope/rejects/utils/Ore.java index 16e8737..d2ef626 100755 --- a/src/main/java/anticope/rejects/utils/Ore.java +++ b/src/main/java/anticope/rejects/utils/Ore.java @@ -206,15 +206,21 @@ public class Ore { } public static List getConfig(MCVersion version) { - return switch (version) { - case v1_19 -> V1_19(); - case v1_18_2, v1_18_1, v1_18 -> V1_18(); - case v1_17_1 -> V1_17_1(); - case v1_17 -> V1_17(); - case v1_16_5, v1_16_4, v1_16_3, v1_16_2, v1_16_1, v1_16 -> V1_16(); - case v1_15_2, v1_15_1, v1_15, v1_14_4, v1_14_3, v1_14_2, v1_14_1, v1_14 -> V1_15(); - default -> null; - }; + if (version.isNewerOrEqualTo(MCVersion.v1_19)) { + return V1_19(); + } else if (version.isNewerOrEqualTo(MCVersion.v1_18)) { + return V1_18(); + } else if (version.isNewerOrEqualTo(MCVersion.v1_17_1)) { + return V1_17_1(); + } else if (version.isNewerOrEqualTo(MCVersion.v1_17)) { + return V1_17(); + } else if (version.isNewerOrEqualTo(MCVersion.v1_16)) { + return V1_16(); + } else if (version.isNewerOrEqualTo(MCVersion.v1_14)) { + return V1_15(); + } else { + return null; + } } public enum Type {