keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Put the FMLModContainer back in it's cage. Delete the ClasspathLocator.

Browse source 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2019-02-01 20:37:04 -05:00
parent e4d20a80ed
commit e000fd2f8f
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
3 changed files with 4 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java
View file

@ -105,11 +105,11 @@ public enum LifecycleEventProvider
this.progression = p;
}
public Event getOrBuildEvent(FMLModContainer fmlModContainer)
public Event getOrBuildEvent(ModContainer modContainer)
{
if (customEventSupplier!=null) return customEventSupplier.get();
return stage.getModEvent(fmlModContainer);
return stage.getModEvent(modContainer);
}
@Override

4
src/main/java/net/minecraftforge/fml/ModLoadingStage.java
View file

@ -44,8 +44,8 @@ public enum ModLoadingStage
this.modLifecycleEventFunction = modLifecycleEventFunction;
}
public ModLifecycleEvent getModEvent(ModContainer fmlModContainer)
public ModLifecycleEvent getModEvent(ModContainer modContainer)
{
return modLifecycleEventFunction.get().apply(fmlModContainer);
return modLifecycleEventFunction.get().apply(modContainer);
}
}

162
src/userdev/java/net/minecraftforge/userdev/ClasspathLocator.java
View file

@ -1,162 +0,0 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2018.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.userdev;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import net.minecraftforge.fml.loading.moddiscovery.IModLocator;
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.*;
import java.util.*;
import java.util.function.Consumer;
import java.util.jar.Manifest;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static net.minecraftforge.fml.Logging.SCAN;
public class ClasspathLocator implements IModLocator
{
private static final Logger LOGGER = LogManager.getLogger();
private static final String COREMODS = "META-INF/coremods.json";
private static final String MODS = "META-INF/mods.toml";
public ClasspathLocator() {}
@Override
public List<ModFile> scanMods() {
Set<URL> modUrls = Sets.newHashSet();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try
{
modUrls.addAll(Collections.list(ClassLoader.getSystemResources(COREMODS)));
modUrls.addAll(Collections.list(loader.getResources(COREMODS)));
modUrls.addAll(Collections.list(ClassLoader.getSystemResources(MODS)));
modUrls.addAll(Collections.list(loader.getResources(MODS)));
}
catch (IOException e)
{
e.printStackTrace();
}
return modUrls.stream().map((url) -> {
try
{
// We got URLs including "META-INF/<something", so get two components up.
return new File(url.toURI()).toPath().getParent().getParent();
}
catch (URISyntaxException e)
{
e.printStackTrace();
}
return null;
})
.filter(Objects::nonNull)
.distinct()
.filter(Files::isRegularFile) //We're only looking for remapped jars, exploded directories are handled by FMLUserdevLaunchProvider
.map(path -> new ModFile(path, this))
.collect(Collectors.toList());
}
@Override
public String name() {
return "classpath mods";
}
@Override
public Path findPath(final ModFile modFile, final String... path) {
if (path.length < 1) {
throw new IllegalArgumentException("Missing path");
}
Path filePath = modFile.getFilePath();
Path classesRoot = getClassesPath(filePath);
String[] tail = Arrays.copyOfRange(path, 1, path.length);
Path classPath = classesRoot.resolve(classesRoot.getFileSystem().getPath(path[0], tail));
if(Files.exists(classPath))
{
return classPath;
}
return filePath.resolve(filePath.getFileSystem().getPath(path[0], tail));
}
@Override
public void scanFile(final ModFile modFile, final Consumer<Path> pathConsumer) {
LOGGER.debug(SCAN,"Scanning classpath");
Path filePath = modFile.getFilePath();
Path scanPath = getClassesPath(filePath);
try (Stream<Path> files = Files.find(scanPath, Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) {
files.forEach(pathConsumer);
} catch (IOException e) {
e.printStackTrace();
}
LOGGER.debug(SCAN,"Classpath scan complete");
}
private Path getClassesPath(Path filePath)
{
Path classesPath = filePath;
/*
// Hack 1: When running from within intellij, we get
// "out/production/resources" + "out/production/classes"
if(filePath.getNameCount() >= 1 && filePath.getName(filePath.getNameCount()-1).toString().equals("resources"))
{
classesPath = filePath.getParent().resolve("classes");
}
// Hack 2: When running from gradle, we get
// "build/resources/<sourceset>" + "build/classes/<language>/<sourceset>"
else if(filePath.getNameCount() >= 2 && filePath.getName(filePath.getNameCount()-2).toString().equals("resources"))
{
// We'll scan all the subdirectories for languages and sourcesets, hopefully that works...
classesPath = filePath.getParent().getParent().resolve("classes");
}
*/
return classesPath;
}
@Override
public String toString()
{
return "{Classpath locator}";
}
@Override
public Optional<Manifest> findManifest(Path file)
{
return Optional.empty();
}
@Override
public void initArguments(final Map<String, ?> arguments) {
}
}