Skip to content

Commit 9080195

Browse files
authored
Support Snapshot MC_VERSION starting on 26.1 (#3000)
1 parent b4a91e4 commit 9080195

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

common/src/main/java/net/irisshaders/iris/Iris.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public class Iris {
8686
public static final boolean IS_FOOL;
8787
private static final Map<String, String> shaderPackOptionQueue = new HashMap<>();
8888
// Change this for snapshots!
89-
private static final String backupVersionNumber = "1.21.9";
9089
public static NamespacedId lastDimension = null;
9190
public static boolean testing = false;
9291
private static Path shaderpacksDirectory;
@@ -738,13 +737,9 @@ public static String getFormattedVersion() {
738737
* @return Release target
739738
*/
740739
public static String getReleaseTarget() {
741-
// If this is a snapshot, you must change backupVersionNumber!
742740
SharedConstants.tryDetectVersion();
743-
return SharedConstants.getCurrentVersion().stable() ? SharedConstants.getCurrentVersion().name() : backupVersionNumber;
744-
}
745-
746-
public static String getBackupVersionNumber() {
747-
return backupVersionNumber;
741+
// Since 26.1 snapshot names now also contain the current MC version, we just have to remove everything after the first space. "26.1 Snapshot 1" -> "26.1"
742+
return SharedConstants.getCurrentVersion().name().replaceFirst("\\s.*", "");
748743
}
749744

750745
public static Path getShaderpacksDirectory() {

common/src/main/java/net/irisshaders/iris/gl/shader/StandardMacros.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,6 @@ public static String getMcVersion() {
137137
} else {
138138
return formattedVersion;
139139
}
140-
String backupVersion = Iris.getBackupVersionNumber();
141-
String formattedBackupVersion = formatVersionString(backupVersion);
142-
if (formattedBackupVersion == null) {
143-
throw new IllegalArgumentException("Could not parse backup game version \"" + version + "\"");
144-
} else {
145-
return formattedBackupVersion;
146-
}
147140
}
148141

149142

0 commit comments

Comments
 (0)