Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
index 436f9b6b..e97a6e3c 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
@@ -112,11 +112,13 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen
 
 	@Override
 	public MappingSet getOrCreateSrcMappingCache(int id, Supplier<MappingSet> factory) {
+		if (id < 0 || id >= srcMappingCache.length) return factory.get();
 		return srcMappingCache[id] != null ? srcMappingCache[id] : (srcMappingCache[id] = factory.get());
 	}
 
 	@Override
 	public Mercury getOrCreateSrcMercuryCache(int id, Supplier<Mercury> factory) {
+		if (id < 0 || id >= srcMercuryCache.length) return factory.get();
 		return srcMercuryCache[id] != null ? srcMercuryCache[id] : (srcMercuryCache[id] = factory.get());
 	}
 
@@ -167,4 +169,9 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen
 	public MixinApExtension getMixinApExtension() {
 		return this.mixinApExtension;
 	}
+
+	@Override
+	protected String getMinecraftVersion() {
+		return getMinecraftProvider().minecraftVersion();
+	}
 }