Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future

2 files changed, 29 insertions, 0 deletions

diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
index f71bf3fb..b2a6cc4d 100644
--- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
+++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
@@ -133,6 +133,11 @@ public class ModCompileRemapper {
 		File input = artifact.getFile();
 
 		try (ZipFile zipFile = new ZipFile(input)) {
+			if (zipFile.getEntry("architectury.common.marker") != null) {
+				logger.info("Found architectury common mod in " + config + ": {}", artifact.getId());
+				return true;
+			}
+
 			if (forge) {
 				if (zipFile.getEntry("META-INF/mods.toml") != null) {
 					logger.info("Found Forge mod in " + config + ": {}", artifact.getId());
diff --git a/src/main/java/net/fabricmc/loom/build/nesting/EmptyNestedJarProvider.java b/src/main/java/net/fabricmc/loom/build/nesting/EmptyNestedJarProvider.java
index df9f7cab..e91496e6 100644
--- a/src/main/java/net/fabricmc/loom/build/nesting/EmptyNestedJarProvider.java
+++ b/src/main/java/net/fabricmc/loom/build/nesting/EmptyNestedJarProvider.java
@@ -1,3 +1,27 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2016, 2017, 2018 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 package net.fabricmc.loom.build.nesting;
 
 import java.io.File;