Compare commits

..
13 Commits
Author SHA1 Message Date
Jason Mitchell 1ee3abf0ff update dependencies 2022-01-17 20:23:27 -08:00
Jason Mitchell a37aeac535 maven publish buildscript update 2022-01-17 20:15:32 -08:00
Jason Mitchell 9adf1b6650 maven publish buildscript update 2022-01-17 20:13:53 -08:00
Martin Robertz 883d46d86b Merge pull request #5 from GTNewHorizons/gtnhcheck
add an early low memory error to GTNH
2022-01-01 23:40:11 +01:00
bombcar 0fc1466f9c remove unused import 2022-01-01 01:50:58 -06:00
bombcar 352301c8ea use GB instead of GiB 2022-01-01 01:49:42 -06:00
bombcar 3adeff110f update exit code 2022-01-01 01:37:59 -06:00
bombcar 6aa549db9a typo 2021-12-31 22:41:20 -06:00
bombcar bd177ae0bc add an early low memory error to GTNH 2021-12-31 22:37:18 -06:00
Martin Robertz 55ccf763b0 Merge pull request #4 from GTNewHorizons/fixbuild
fixbuild
2021-12-23 23:18:02 +01:00
bombcar 1cca8bba34 another System.out 2021-12-23 11:46:31 -06:00
bombcar 23a1fd9236 logger 2021-12-23 11:38:40 -06:00
bombcar f9d8801644 fixbuild 2021-12-21 09:28:19 -06:00
9 changed files with 187 additions and 53 deletions

No files matched your search

+6
View File
@@ -43,3 +43,9 @@ jobs:
prerelease: false prerelease: false
title: "${{ env.RELEASE_VERSION }}" title: "${{ env.RELEASE_VERSION }}"
files: build/libs/*.jar files: build/libs/*.jar
- name: Publish to Maven
run: ./gradlew publish
env:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+3
View File
@@ -0,0 +1,3 @@
# Any Github changes require admin approval
/.github/** @GTNewHorizons/admin
+94 -34
View File
@@ -1,9 +1,9 @@
//version: 928ecf7feb33a1149538b0e2cd17e3bc5f281428 //version: 1642464427
/* /*
DO NOT CHANGE THIS FILE! DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available. Also, you may replace this file at any time if there is an update available.
Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates. Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
*/ */
@@ -32,7 +32,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4' classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5'
} }
} }
@@ -42,6 +42,7 @@ plugins {
id("org.ajoberstar.grgit") version("3.1.1") id("org.ajoberstar.grgit") version("3.1.1")
id("com.github.johnrengelman.shadow") version("4.0.4") id("com.github.johnrengelman.shadow") version("4.0.4")
id("com.palantir.git-version") version("0.12.3") id("com.palantir.git-version") version("0.12.3")
id("maven-publish")
} }
apply plugin: 'forge' apply plugin: 'forge'
@@ -150,12 +151,16 @@ configurations.all {
// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version // Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
'git config core.fileMode false'.execute() 'git config core.fileMode false'.execute()
// Pulls version from git tag
// Pulls version first from the VERSION env and then git tag
String identifiedVersion
try { try {
version = minecraftVersion + "-" + gitVersion() String versionOverride = System.getenv("VERSION") ?: null
identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
version = minecraftVersion + "-" + identifiedVersion
} }
catch (Exception e) { catch (Exception e) {
throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!"); throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag, or the VERSION override must be set!");
} }
group = modGroup group = modGroup
@@ -194,7 +199,9 @@ if(file("addon.gradle").exists()) {
apply from: 'repositories.gradle' apply from: 'repositories.gradle'
configurations { configurations {
implementation.extendsFrom(shadowImplementation) implementation.extendsFrom(shadowImplementation) // TODO: remove after all uses are refactored
implementation.extendsFrom(shadowCompile)
implementation.extendsFrom(shadeCompile)
} }
repositories { repositories {
@@ -220,7 +227,7 @@ dependencies {
annotationProcessor("com.google.code.gson:gson:2.8.6") annotationProcessor("com.google.code.gson:gson:2.8.6")
annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT") annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
// using 0.8 to workaround a issue in 0.7 which fails mixin application // using 0.8 to workaround a issue in 0.7 which fails mixin application
compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") { compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
// Mixin includes a lot of dependencies that are too up-to-date // Mixin includes a lot of dependencies that are too up-to-date
exclude module: "launchwrapper" exclude module: "launchwrapper"
exclude module: "guava" exclude module: "guava"
@@ -228,7 +235,7 @@ dependencies {
exclude module: "commons-io" exclude module: "commons-io"
exclude module: "log4j-core" exclude module: "log4j-core"
} }
compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev") compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
} }
} }
@@ -260,16 +267,28 @@ task relocateShadowJar(type: ConfigureShadowRelocation) {
} }
shadowJar { shadowJar {
project.configurations.shadeCompile.each { dep ->
from(project.zipTree(dep)) {
exclude 'META-INF', 'META-INF/**'
}
}
manifest { manifest {
attributes(getManifestAttributes()) attributes(getManifestAttributes())
} }
minimize() // This will only allow shading for actually used classes minimize() // This will only allow shading for actually used classes
configurations = [project.configurations.shadowImplementation] configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
dependsOn(relocateShadowJar) dependsOn(relocateShadowJar)
} }
jar { jar {
project.configurations.shadeCompile.each { dep ->
from(project.zipTree(dep)) {
exclude 'META-INF', 'META-INF/**'
}
}
manifest { manifest {
attributes(getManifestAttributes()) attributes(getManifestAttributes())
} }
@@ -343,31 +362,31 @@ tasks.withType(JavaExec).configureEach {
} }
processResources processResources
{ {
// this will ensure that this task is redone when the versions change. // this will ensure that this task is redone when the versions change.
inputs.property "version", project.version inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version inputs.property "mcversion", project.minecraft.version
// replace stuff in mcmod.info, nothing else // replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info' include 'mcmod.info'
// replace version and mcversion // replace version and mcversion
expand "minecraftVersion": project.minecraft.version, expand "minecraftVersion": project.minecraft.version,
"modVersion": versionDetails().lastTag, "modVersion": versionDetails().lastTag,
"modId": modId, "modId": modId,
"modName": modName "modName": modName
} }
if(usesMixins.toBoolean()) { if(usesMixins.toBoolean()) {
from refMap from refMap
} }
// copy everything else, thats not the mcmod.info // copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info' exclude 'mcmod.info'
} }
} }
def getManifestAttributes() { def getManifestAttributes() {
def manifestAttributes = [:] def manifestAttributes = [:]
@@ -400,6 +419,12 @@ task sourcesJar(type: Jar) {
} }
task shadowDevJar(type: ShadowJar) { task shadowDevJar(type: ShadowJar) {
project.configurations.shadeCompile.each { dep ->
from(project.zipTree(dep)) {
exclude 'META-INF', 'META-INF/**'
}
}
from sourceSets.main.output from sourceSets.main.output
getArchiveClassifier().set("dev") getArchiveClassifier().set("dev")
@@ -408,7 +433,7 @@ task shadowDevJar(type: ShadowJar) {
} }
minimize() // This will only allow shading for actually used classes minimize() // This will only allow shading for actually used classes
configurations = [project.configurations.shadowImplementation] configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
} }
task relocateShadowDevJar(type: ConfigureShadowRelocation) { task relocateShadowDevJar(type: ConfigureShadowRelocation) {
@@ -423,6 +448,12 @@ task circularResolverJar(type: Jar) {
} }
task devJar(type: Jar) { task devJar(type: Jar) {
project.configurations.shadeCompile.each { dep ->
from(project.zipTree(dep)) {
exclude 'META-INF', 'META-INF/**'
}
}
from sourceSets.main.output from sourceSets.main.output
getArchiveClassifier().set("dev") getArchiveClassifier().set("dev")
@@ -460,6 +491,35 @@ artifacts {
} }
} }
// publishing
publishing {
publications {
maven(MavenPublication) {
artifact source: jar
artifact source: sourcesJar, classifier: "src"
artifact source: devJar, classifier: "dev"
if (apiPackage) {
artifact source: apiJar, classifier: "api"
}
groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
artifactId = System.getenv("ARTIFACT_ID") ?: project.name
// Using the identified version, not project.version as it has the prepended 1.7.10
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
}
}
repositories {
maven {
url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
credentials {
username = System.getenv("MAVEN_USER") ?: "NONE"
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
}
}
}
}
// Updating // Updating
task updateBuildScript { task updateBuildScript {
doLast { doLast {
@@ -478,7 +538,7 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
} }
static URL availableBuildScriptUrl() { static URL availableBuildScriptUrl() {
new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle") new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
} }
boolean performBuildScriptUpdate(String projectDir) { boolean performBuildScriptUpdate(String projectDir) {
@@ -520,7 +580,7 @@ configure(updateBuildScript) {
def checkPropertyExists(String propertyName) { def checkPropertyExists(String propertyName) {
if (project.hasProperty(propertyName) == false) { if (project.hasProperty(propertyName) == false) {
throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties") throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
} }
} }
+1 -1
View File
@@ -1,5 +1,5 @@
// Add your dependencies here // Add your dependencies here
dependencies { dependencies {
compile("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev") compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev")
} }
+5 -5
View File
@@ -15,15 +15,15 @@ autoUpdateBuildScript = false
minecraftVersion = 1.7.10 minecraftVersion = 1.7.10
forgeVersion = 10.13.4.1614 forgeVersion = 10.13.4.1614
# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you # Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
# restart Minecraft in development. Choose this dependent on your mod: # restart Minecraft in development. Choose this dependent on your mod:
# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
developmentEnvironmentUserName = "Developer" developmentEnvironmentUserName = Developer
# Define a source file of your project with: # Define a source file of your project with:
# public static final String VERSION = "GRADLETOKEN_VERSION"; # public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]) # version in @Mod([...], version = VERSION, [...])
# Leave these properties empty to skip individual token replacements # Leave these properties empty to skip individual token replacements
replaceGradleTokenInFile = CodeChickenCoreModContainer.java replaceGradleTokenInFile = CodeChickenCoreModContainer.java
@@ -32,7 +32,7 @@ gradleTokenModName = GRADLETOKEN_MODNAME
gradleTokenVersion = GRADLETOKEN_VERSION gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenGroupName = gradleTokenGroupName =
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty. # leave this property empty.
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api # Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
apiPackage = apiPackage =
@@ -48,7 +48,7 @@ mixinPlugin =
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
mixinsPackage = mixinsPackage =
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
# This parameter is for legacy compatability only # This parameter is for legacy compatibility only
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
coreModClass = core.launch.CodeChickenCorePlugin coreModClass = core.launch.CodeChickenCorePlugin
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
Vendored Regular → Executable
View File
File mode changed.
@@ -1,5 +1,7 @@
package codechicken.core; package codechicken.core;
import codechicken.core.launch.CodeChickenCorePlugin;
public class ProfileTimer public class ProfileTimer
{ {
public double decay; public double decay;
@@ -33,7 +35,6 @@ public class ProfileTimer
scanCount++; scanCount++;
if(logScans > 0 && scanCount % logScans == 0) if(logScans > 0 && scanCount % logScans == 0)
System.out.println("Profiled " + logName + " " + nanoTime + "ns"); CodeChickenCorePlugin.logger.info("Profiled " + logName + " " + nanoTime + "ns");
} }
} }
@@ -1,9 +1,11 @@
package codechicken.core.launch; package codechicken.core.launch;
import java.awt.Desktop; import java.awt.*;
import java.io.File; import java.io.File;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.jar.Attributes; import java.util.jar.Attributes;
@@ -16,6 +18,7 @@ import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener; import javax.swing.event.HyperlinkListener;
import codechicken.core.asm.*; import codechicken.core.asm.*;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.CoreModManager; import cpw.mods.fml.relauncher.CoreModManager;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
@@ -91,6 +94,64 @@ public class CodeChickenCorePlugin implements IFMLLoadingPlugin, IFMLCallHook
} }
} }
public static long parseSize(String text) {
double d = Double.parseDouble(text.replaceAll("[GMK]B?$", ""));
long l = Math.round(d * 1024 * 1024 * 1024L);
switch (text.replaceAll("\\d?","").toUpperCase().charAt(0)) {
default: l /= 1024;
case 'K': l /= 1024;
case 'M': l /= 1024;
case 'G': return l;
}
}
public static String humanReadableByteCountBin(long bytes) {
long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
if (absB < 1024) {
return bytes + " B";
}
long value = absB;
CharacterIterator ci = new StringCharacterIterator("KMGTPE");
for (int i = 40; i >= 0 && absB > 0xfffccccccccccccL >> i; i -= 10) {
value >>= 10;
ci.next();
}
value *= Long.signum(bytes);
return String.format("%.1f %cB", value / 1024.0, ci.current());
}
public static void systemCheck(String minRAM) {
long minBytes = parseSize(minRAM);
if (Runtime.getRuntime().maxMemory() < minBytes) {
String err = "You should have at least " + minRAM + " of RAM but you have only allocated " + humanReadableByteCountBin(Runtime.getRuntime().maxMemory()) + ".";
logger.error(err);
JEditorPane ep = new JEditorPane("text/html",
"<html>" +
err +
"<br>GTNH seriously won't run without enough RAM. See <a href=\"https://gtnh.miraheze.org/m/3S2\">the Wiki</a> for details." +
"<br>Recommended values are between 4GB and 6GB. Check your launcher's JVM arguments." +
"</html>");
ep.setEditable(false);
ep.setOpaque(false);
ep.addHyperlinkListener(new HyperlinkListener()
{
@Override
public void hyperlinkUpdate(HyperlinkEvent event) {
try {
if (event.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED))
Desktop.getDesktop().browse(event.getURL().toURI());
} catch (Exception ignored) {}
}
});
if (!GraphicsEnvironment.isHeadless())
JOptionPane.showMessageDialog(null, ep, "lol nope", JOptionPane.ERROR_MESSAGE);
FMLCommonHandler.instance().exitJava(-98, true);
}
}
@Override @Override
public String[] getASMTransformerClass() { public String[] getASMTransformerClass() {
versionCheck(mcVersion, "CodeChickenCore"); versionCheck(mcVersion, "CodeChickenCore");
@@ -124,6 +185,7 @@ public class CodeChickenCorePlugin implements IFMLLoadingPlugin, IFMLCallHook
@Override @Override
public Void call() { public Void call() {
CodeChickenCoreModContainer.loadConfig(); CodeChickenCoreModContainer.loadConfig();
systemCheck(CodeChickenCoreModContainer.config.getTag("minRAM").getValue("3GB"));
TweakTransformer.load(); TweakTransformer.load();
scanCodeChickenMods(); scanCodeChickenMods();
@@ -12,6 +12,8 @@ import net.minecraft.launchwrapper.LaunchClassLoader;
import sun.misc.URLClassPath; import sun.misc.URLClassPath;
import sun.net.util.URLUtil; import sun.net.util.URLUtil;
import codechicken.core.launch.CodeChickenCorePlugin;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener; import javax.swing.event.HyperlinkListener;
@@ -184,7 +186,7 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
} }
}); });
JOptionPane.showMessageDialog(null, ep, "A download error has occured", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(null, ep, "A download error has occurred", JOptionPane.ERROR_MESSAGE);
} }
} }
@@ -318,9 +320,9 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
if (!mod.delete()) { if (!mod.delete()) {
mod.deleteOnExit(); mod.deleteOnExit();
String msg = owner + " was unable to delete file " + mod.getPath() + " the game will now try to delete it on exit. If this dialog appears again, delete it manually."; String msg = owner + " was unable to delete file " + mod.getPath() + " the game will now try to delete it on exit. If this dialog appears again, delete it manually.";
System.err.println(msg); CodeChickenCorePlugin.logger.error(msg);
if (!GraphicsEnvironment.isHeadless()) if (!GraphicsEnvironment.isHeadless())
JOptionPane.showMessageDialog(null, msg, "An update error has occured", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(null, msg, "An update error has occurred", JOptionPane.ERROR_MESSAGE);
System.exit(1); System.exit(1);
} }
@@ -332,7 +334,7 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
try { try {
URL libDownload = new URL(dep.url + '/' + dep.file.filename); URL libDownload = new URL(dep.url + '/' + dep.file.filename);
downloadMonitor.updateProgressString("Downloading file %s", libDownload.toString()); downloadMonitor.updateProgressString("Downloading file %s", libDownload.toString());
System.out.format("Downloading file %s\n", libDownload.toString()); CodeChickenCorePlugin.logger.debug("Downloading file " + libDownload);
URLConnection connection = libDownload.openConnection(); URLConnection connection = libDownload.openConnection();
connection.setConnectTimeout(5000); connection.setConnectTimeout(5000);
connection.setReadTimeout(5000); connection.setReadTimeout(5000);
@@ -340,13 +342,13 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
int sizeGuess = connection.getContentLength(); int sizeGuess = connection.getContentLength();
download(connection.getInputStream(), sizeGuess, libFile); download(connection.getInputStream(), sizeGuess, libFile);
downloadMonitor.updateProgressString("Download complete"); downloadMonitor.updateProgressString("Download complete");
System.out.println("Download complete"); CodeChickenCorePlugin.logger.trace("Download complete");
scanDepInfo(libFile); scanDepInfo(libFile);
} catch (Exception e) { } catch (Exception e) {
libFile.delete(); libFile.delete();
if (downloadMonitor.shouldStopIt()) { if (downloadMonitor.shouldStopIt()) {
System.err.println("You have stopped the downloading operation before it could complete"); CodeChickenCorePlugin.logger.error("You have stopped the downloading operation before it could complete");
System.exit(1); System.exit(1);
return; return;
} }
@@ -428,12 +430,12 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
int cmp = vfile.version.compareTo(dep.file.version); int cmp = vfile.version.compareTo(dep.file.version);
if (cmp < 0) { if (cmp < 0) {
System.out.println("Deleted old version " + f.getName()); CodeChickenCorePlugin.logger.warn("Deleted old version " + f.getName());
deleteMod(f); deleteMod(f);
return null; return null;
} }
if (cmp > 0) { if (cmp > 0) {
System.err.println("Warning: version of " + dep.file.name + ", " + vfile.version + " is newer than request " + dep.file.version); CodeChickenCorePlugin.logger.warn("Warning: version of " + dep.file.name + ", " + vfile.version + " is newer than request " + dep.file.version);
return f.getName(); return f.getName();
} }
return f.getName();//found dependency return f.getName();//found dependency
@@ -507,7 +509,7 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
loadJSon(zip.getInputStream(e)); loadJSon(zip.getInputStream(e));
zip.close(); zip.close();
} catch (Exception e) { } catch (Exception e) {
System.err.println("Failed to load dependencies.info from " + file.getName() + " as JSON"); CodeChickenCorePlugin.logger.error("Failed to load dependencies.info from " + file.getName() + " as JSON");
e.printStackTrace(); e.printStackTrace();
} }
} }
@@ -547,7 +549,7 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
if(node.has("pattern")) if(node.has("pattern"))
pattern = Pattern.compile(node.get("pattern").getAsString()); pattern = Pattern.compile(node.get("pattern").getAsString());
} catch (PatternSyntaxException e) { } catch (PatternSyntaxException e) {
System.err.println("Invalid filename pattern: "+node.get("pattern")); CodeChickenCorePlugin.logger.error("Invalid filename pattern: " + node.get("pattern"));
e.printStackTrace(); e.printStackTrace();
} }
if(pattern == null) if(pattern == null)