mirror of
https://github.com/GTNewHorizons/CodeChickenCore.git
synced 2026-11-17 02:55:10 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99e35345d1 | ||
|
|
7f78ceb921 | ||
|
|
4686fe8fa1 | ||
|
|
c5b8594660 | ||
|
|
7b0ab21823 | ||
|
|
dd1abf7ac4 |
No files matched your search
@@ -26,3 +26,4 @@ whitelist.json
|
|||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
src/main/resources/mixins.*.json
|
src/main/resources/mixins.*.json
|
||||||
|
*.bat
|
||||||
+2
-1620
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api('com.github.GTNewHorizons:CodeChickenLib:1.1.9:dev')
|
api('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev')
|
||||||
}
|
}
|
||||||
+126
-35
@@ -1,85 +1,128 @@
|
|||||||
|
# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
|
||||||
|
# LOCAL to test local config updates.
|
||||||
|
gtnh.settings.blowdryerTag = 0.2.0
|
||||||
|
|
||||||
|
# Human-readable mod name, available for mcmod.info population.
|
||||||
modName = CodeChicken Core
|
modName = CodeChicken Core
|
||||||
|
|
||||||
# This is a case-sensitive string to identify your mod. Convention is to use lower case.
|
# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
|
||||||
|
# Conventionally lowercase.
|
||||||
modId = CodeChickenCore
|
modId = CodeChickenCore
|
||||||
|
|
||||||
|
# Root package of the mod, used to find various classes in other properties,
|
||||||
|
# mcmod.info substitution, enabling assertions in run tasks, etc.
|
||||||
modGroup = codechicken
|
modGroup = codechicken
|
||||||
|
|
||||||
# WHY is there no version field?
|
# Whether to use modGroup as the maven publishing group.
|
||||||
# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
|
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
|
||||||
# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
|
useModGroupForPublishing = false
|
||||||
|
|
||||||
# Will update your build.gradle automatically whenever an update is available
|
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
|
||||||
autoUpdateBuildScript = false
|
autoUpdateBuildScript = false
|
||||||
|
|
||||||
|
# Version of Minecraft to target
|
||||||
minecraftVersion = 1.7.10
|
minecraftVersion = 1.7.10
|
||||||
|
|
||||||
|
# Version of Minecraft Forge to target
|
||||||
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 username each time you
|
# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
|
||||||
# restart Minecraft in development. Choose this dependent on your mod:
|
channel = stable
|
||||||
# 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
|
# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
|
||||||
|
mappingsVersion = 12
|
||||||
|
|
||||||
|
# Defines other MCP mappings for dependency deobfuscation.
|
||||||
|
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
|
||||||
|
|
||||||
|
# Select a default username for testing your mod. You can always override this per-run by running
|
||||||
|
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
|
||||||
developmentEnvironmentUserName = Developer
|
developmentEnvironmentUserName = Developer
|
||||||
|
|
||||||
# Generate a class with String fields for the mod id, name, version and group name named with the fields below
|
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
|
||||||
|
# See https://github.com/bsideup/jabel for details on how this works.
|
||||||
|
enableModernJavaSyntax = false
|
||||||
|
|
||||||
|
# Enables injecting missing generics into the decompiled source code for a better coding experience.
|
||||||
|
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
|
||||||
|
enableGenericInjection = false
|
||||||
|
|
||||||
|
# Generate a class with a String field for the mod version named as defined below.
|
||||||
|
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
|
||||||
|
# If gradleTokenVersion is empty or missing, the field will not be present in the class.
|
||||||
generateGradleTokenClass = codechicken.core.asm.Tags
|
generateGradleTokenClass = codechicken.core.asm.Tags
|
||||||
gradleTokenModId = MODID
|
|
||||||
gradleTokenModName = MODNAME
|
# Name of the token containing the project's current version to generate/replace.
|
||||||
gradleTokenVersion = VERSION
|
gradleTokenVersion = VERSION
|
||||||
gradleTokenGroupName = GROUPNAME
|
|
||||||
# [DEPRECATED]
|
# [DEPRECATED]
|
||||||
# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java
|
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
|
||||||
# public static final String VERSION = "GRADLETOKEN_VERSION";
|
# public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||||
# The string's content will be replaced with your mod's 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 =
|
replaceGradleTokenInFile =
|
||||||
|
|
||||||
# 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 =
|
||||||
|
|
||||||
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
||||||
# Example value: mymodid_at.cfg
|
# There can be multiple files in a space-separated list.
|
||||||
|
# Example value: mymodid_at.cfg nei_at.cfg
|
||||||
accessTransformersFile =
|
accessTransformersFile =
|
||||||
|
|
||||||
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
||||||
usesMixins = false
|
usesMixins = false
|
||||||
# Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise.
|
|
||||||
|
# Adds some debug arguments like verbose output and class export.
|
||||||
|
usesMixinDebug = false
|
||||||
|
|
||||||
|
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||||
mixinPlugin =
|
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 compatibility 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
|
||||||
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
|
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
|
||||||
containsMixinsAndOrCoreModOnly = true
|
containsMixinsAndOrCoreModOnly = true
|
||||||
|
|
||||||
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
|
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
|
||||||
# responsibility check the licence and request permission for distribution, if required.
|
forceEnableMixins = false
|
||||||
|
|
||||||
|
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
|
||||||
|
# responsibility to check the license and request permission for distribution if required.
|
||||||
usesShadowedDependencies = false
|
usesShadowedDependencies = false
|
||||||
|
|
||||||
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
|
# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
|
||||||
|
# their own classes, making the minimization unreliable.
|
||||||
|
minimizeShadowedDependencies = true
|
||||||
|
|
||||||
# The project's numeric ID on CurseForge. You can find this in the About Project box.
|
# If disabled, won't rename the shadowed classes.
|
||||||
# Leave this empty if you don't want to publish on CurseForge.
|
relocateShadowedDependencies = true
|
||||||
curseForgeProjectId = 746279
|
|
||||||
|
|
||||||
# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
|
# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||||
# Syntax: type1:name1;type2:name2;...
|
includeWellKnownRepositories = true
|
||||||
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
|
|
||||||
# and the name is the CurseForge project id of the other mod.
|
|
||||||
# curseForgeRelations =
|
|
||||||
|
|
||||||
|
# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
|
||||||
|
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
|
||||||
|
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
|
||||||
|
usesMavenPublishing = true
|
||||||
|
|
||||||
# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
|
# Maven repository to publish the mod to.
|
||||||
|
# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
|
||||||
|
|
||||||
|
# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
|
||||||
|
#
|
||||||
# The project's ID on Modrinth. Can be either the slug or the ID.
|
# The project's ID on Modrinth. Can be either the slug or the ID.
|
||||||
# Leave this empty if you don't want to publish on Modrinth.
|
# Leave this empty if you don't want to publish to Modrinth.
|
||||||
|
|
||||||
modrinthProjectId = codechickencore-unofficial
|
modrinthProjectId = codechickencore-unofficial
|
||||||
|
|
||||||
# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
|
# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
|
||||||
@@ -87,6 +130,54 @@ modrinthProjectId = codechickencore-unofficial
|
|||||||
# Where scope can be one of [required, optional, incompatible, embedded],
|
# Where scope can be one of [required, optional, incompatible, embedded],
|
||||||
# type can be one of [project, version],
|
# type can be one of [project, version],
|
||||||
# and the name is the Modrinth project or version slug/id of the other mod.
|
# and the name is the Modrinth project or version slug/id of the other mod.
|
||||||
|
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
|
||||||
|
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
|
||||||
|
modrinthRelations =
|
||||||
|
|
||||||
# modrinthRelations =
|
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
|
||||||
|
#
|
||||||
|
# The project's numeric ID on CurseForge. You can find this in the About Project box.
|
||||||
|
# Leave this empty if you don't want to publish on CurseForge.
|
||||||
|
curseForgeProjectId = 746279
|
||||||
|
|
||||||
|
# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
|
||||||
|
# Syntax: type1:name1;type2:name2;...
|
||||||
|
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
|
||||||
|
# and the name is the CurseForge project slug of the other mod.
|
||||||
|
# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
|
||||||
|
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
|
||||||
|
curseForgeRelations =
|
||||||
|
|
||||||
|
# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
|
||||||
|
# projects. New projects should not use this parameter.
|
||||||
|
# customArchiveBaseName =
|
||||||
|
|
||||||
|
# Optional parameter to have the build automatically fail if an illegal version is used.
|
||||||
|
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
||||||
|
# The check is ONLY performed if the version is a git tag.
|
||||||
|
# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
|
||||||
|
# versionPattern =
|
||||||
|
|
||||||
|
# Uncomment to prevent the source code from being published.
|
||||||
|
# noPublishedSources = true
|
||||||
|
|
||||||
|
# Uncomment this to disable Spotless checks.
|
||||||
|
# This should only be uncommented to keep it easier to sync with upstream/other forks.
|
||||||
|
# That is, if there is no other active fork/upstream, NEVER change this.
|
||||||
|
# disableSpotless = true
|
||||||
|
|
||||||
|
# Uncomment this to disable Checkstyle checks (currently wildcard import check).
|
||||||
|
# disableCheckstyle = true
|
||||||
|
|
||||||
|
# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
|
||||||
|
# (force use delegated build).
|
||||||
|
# This is meant to be set in $HOME/.gradle/gradle.properties.
|
||||||
|
# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
|
||||||
|
# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
|
||||||
|
# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
|
||||||
|
# ideaOverrideBuildType = idea
|
||||||
|
|
||||||
|
# Whether IDEA should run spotless checks when pressing the Build button.
|
||||||
|
# This is meant to be set in $HOME/.gradle/gradle.properties.
|
||||||
|
# ideaCheckSpotlessOnBuild = true
|
||||||
|
|
||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -83,10 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -133,10 +131,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
Vendored
+10
-10
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|||||||
+5
-10
@@ -4,10 +4,10 @@ pluginManagement {
|
|||||||
maven {
|
maven {
|
||||||
// RetroFuturaGradle
|
// RetroFuturaGradle
|
||||||
name "GTNH Maven"
|
name "GTNH Maven"
|
||||||
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
url "https://nexus.gtnewhorizons.com/repository/public/"
|
||||||
allowInsecureProtocol = true
|
|
||||||
mavenContent {
|
mavenContent {
|
||||||
includeGroup("com.gtnewhorizons.retrofuturagradle")
|
includeGroup("com.gtnewhorizons")
|
||||||
|
includeGroupByRegex("com\\.gtnewhorizons\\..+")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
@@ -17,12 +17,7 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.diffplug.blowdryerSetup' version '1.6.0'
|
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
|
|
||||||
}
|
}
|
||||||
|
|
||||||
blowdryerSetup {
|
|
||||||
repoSubfolder 'gtnhShared'
|
|
||||||
github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
|
|
||||||
//devLocal '.' // Use this when testing config updates locally
|
|
||||||
}
|
|
||||||
@@ -1,113 +1,22 @@
|
|||||||
package codechicken.core;
|
package codechicken.core;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.net.HttpURLConnection;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.SocketTimeoutException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.util.ChatComponentText;
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
|
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
|
|
||||||
import codechicken.core.launch.CodeChickenCorePlugin;
|
|
||||||
import cpw.mods.fml.common.Loader;
|
|
||||||
import cpw.mods.fml.common.versioning.ComparableVersion;
|
|
||||||
import cpw.mods.fml.relauncher.FMLInjectionData;
|
import cpw.mods.fml.relauncher.FMLInjectionData;
|
||||||
|
|
||||||
public class CCUpdateChecker {
|
public class CCUpdateChecker {
|
||||||
|
|
||||||
private static final ArrayList<String> updates = new ArrayList<String>();
|
public static void tick() {}
|
||||||
|
|
||||||
private static class ThreadUpdateCheck extends Thread {
|
public static void addUpdateMessage(String s) {}
|
||||||
|
|
||||||
private final URL url;
|
|
||||||
private final Function<String, Void> handler;
|
|
||||||
|
|
||||||
public ThreadUpdateCheck(URL url, Function<String, Void> handler) {
|
|
||||||
this.url = url;
|
|
||||||
this.handler = handler;
|
|
||||||
|
|
||||||
setName("CodeChicken Update Checker");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
try {
|
|
||||||
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
|
|
||||||
conn.setRequestMethod("GET");
|
|
||||||
conn.setConnectTimeout(5000);
|
|
||||||
conn.setReadTimeout(5000);
|
|
||||||
BufferedReader read = new BufferedReader(new InputStreamReader(conn.getInputStream()));
|
|
||||||
String ret = read.readLine();
|
|
||||||
read.close();
|
|
||||||
if (ret == null) ret = "";
|
|
||||||
handler.apply(ret);
|
|
||||||
} catch (SocketTimeoutException ignored) {} catch (UnknownHostException ignored) {} catch (IOException iox) {
|
|
||||||
iox.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void tick() {
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
|
||||||
if (!mc.inGameHasFocus) return;
|
|
||||||
|
|
||||||
synchronized (updates) {
|
|
||||||
for (String s : updates) mc.thePlayer.addChatMessage(new ChatComponentText(s));
|
|
||||||
updates.clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void addUpdateMessage(String s) {
|
|
||||||
synchronized (updates) {
|
|
||||||
updates.add(s);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String mcVersion() {
|
public static String mcVersion() {
|
||||||
return (String) FMLInjectionData.data()[4];
|
return (String) FMLInjectionData.data()[4];
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void updateCheck(final String mod, final String version) {
|
public static void updateCheck(final String mod, final String version) {}
|
||||||
updateCheck(
|
|
||||||
"http://www.chickenbones.net/Files/notification/version.php?" + "version="
|
|
||||||
+ mcVersion()
|
|
||||||
+ "&"
|
|
||||||
+ "file="
|
|
||||||
+ mod,
|
|
||||||
new Function<String, Void>() {
|
|
||||||
|
|
||||||
@Override
|
public static void updateCheck(String mod) {}
|
||||||
public Void apply(String ret) {
|
|
||||||
if (!ret.startsWith("Ret: ")) {
|
|
||||||
CodeChickenCorePlugin.logger
|
|
||||||
.error("Failed to check update for " + mod + " returned: " + ret);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
ComparableVersion newversion = new ComparableVersion(ret.substring(5));
|
|
||||||
if (newversion.compareTo(new ComparableVersion(version)) > 0) addUpdateMessage(
|
|
||||||
StatCollector.translateToLocalFormatted("codechickencore.update", newversion, mod));
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void updateCheck(String mod) {
|
public static void updateCheck(String url, Function<String, Void> handler) {}
|
||||||
updateCheck(mod, Loader.instance().getIndexedModList().get(mod).getVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void updateCheck(String url, Function<String, Void> handler) {
|
|
||||||
try {
|
|
||||||
new ThreadUpdateCheck(new URL(url), handler).start();
|
|
||||||
} catch (MalformedURLException e) {
|
|
||||||
CodeChickenCorePlugin.logger.error("Malformed URL: " + url, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,6 @@ import net.minecraftforge.common.MinecraftForge;
|
|||||||
import com.google.common.eventbus.EventBus;
|
import com.google.common.eventbus.EventBus;
|
||||||
import com.google.common.eventbus.Subscribe;
|
import com.google.common.eventbus.Subscribe;
|
||||||
|
|
||||||
import codechicken.core.CCUpdateChecker;
|
|
||||||
import codechicken.core.ClientUtils;
|
import codechicken.core.ClientUtils;
|
||||||
import codechicken.core.featurehack.LiquidTextures;
|
import codechicken.core.featurehack.LiquidTextures;
|
||||||
import codechicken.core.internal.CCCEventHandler;
|
import codechicken.core.internal.CCCEventHandler;
|
||||||
@@ -75,8 +74,6 @@ public class CodeChickenCoreModContainer extends DummyModContainer {
|
|||||||
@Subscribe
|
@Subscribe
|
||||||
public void init(FMLInitializationEvent event) {
|
public void init(FMLInitializationEvent event) {
|
||||||
if (event.getSide().isClient()) {
|
if (event.getSide().isClient()) {
|
||||||
if (config.getTag("checkUpdates").getBooleanValue(true)) CCUpdateChecker.updateCheck(getModId());
|
|
||||||
|
|
||||||
ClientUtils.enhanceSupportersList("CodeChickenCore");
|
ClientUtils.enhanceSupportersList("CodeChickenCore");
|
||||||
|
|
||||||
FMLCommonHandler.instance().bus().register(new CCCEventHandler());
|
FMLCommonHandler.instance().bus().register(new CCCEventHandler());
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package codechicken.core.internal;
|
|||||||
|
|
||||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||||
|
|
||||||
import codechicken.core.CCUpdateChecker;
|
|
||||||
import codechicken.core.GuiModListScroll;
|
import codechicken.core.GuiModListScroll;
|
||||||
import cpw.mods.fml.client.GuiModList;
|
import cpw.mods.fml.client.GuiModList;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
@@ -19,7 +18,6 @@ public class CCCEventHandler {
|
|||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void clientTick(TickEvent.ClientTickEvent event) {
|
public void clientTick(TickEvent.ClientTickEvent event) {
|
||||||
if (event.phase == Phase.END) {
|
if (event.phase == Phase.END) {
|
||||||
CCUpdateChecker.tick();
|
|
||||||
renderTime++;
|
renderTime++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ public class CodeChickenCorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
|
|||||||
minecraftDir = (File) FMLInjectionData.data()[6];
|
minecraftDir = (File) FMLInjectionData.data()[6];
|
||||||
currentMcVersion = (String) FMLInjectionData.data()[4];
|
currentMcVersion = (String) FMLInjectionData.data()[4];
|
||||||
|
|
||||||
DepLoader.load();
|
|
||||||
injectDeobfPlugin();
|
injectDeobfPlugin();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,7 +191,8 @@ public class CodeChickenCorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
|
|||||||
public String[] getASMTransformerClass() {
|
public String[] getASMTransformerClass() {
|
||||||
versionCheck(mcVersion, "CodeChickenCore");
|
versionCheck(mcVersion, "CodeChickenCore");
|
||||||
return new String[] { "codechicken.lib.asm.ClassHeirachyManager", "codechicken.core.asm.TweakTransformer",
|
return new String[] { "codechicken.lib.asm.ClassHeirachyManager", "codechicken.core.asm.TweakTransformer",
|
||||||
"codechicken.core.asm.DelegatedTransformer", "codechicken.core.asm.DefaultImplementationTransformer" };
|
"codechicken.core.asm.DelegatedTransformer", "codechicken.core.asm.DefaultImplementationTransformer",
|
||||||
|
"codechicken.lib.asm.RedirectorTransformer" };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,63 +1,17 @@
|
|||||||
package codechicken.core.launch;
|
package codechicken.core.launch;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
|
||||||
import java.awt.Dialog.ModalityType;
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.awt.GraphicsEnvironment;
|
|
||||||
import java.awt.event.WindowAdapter;
|
|
||||||
import java.awt.event.WindowEvent;
|
|
||||||
import java.beans.PropertyChangeEvent;
|
|
||||||
import java.beans.PropertyChangeListener;
|
|
||||||
import java.io.Closeable;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.InterruptedIOException;
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLClassLoader;
|
|
||||||
import java.net.URLConnection;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.regex.PatternSyntaxException;
|
|
||||||
import java.util.zip.ZipEntry;
|
|
||||||
import java.util.zip.ZipFile;
|
|
||||||
|
|
||||||
import javax.swing.Box;
|
import javax.swing.Box;
|
||||||
import javax.swing.JDialog;
|
import javax.swing.JDialog;
|
||||||
import javax.swing.JEditorPane;
|
|
||||||
import javax.swing.JLabel;
|
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
import javax.swing.JProgressBar;
|
|
||||||
import javax.swing.WindowConstants;
|
|
||||||
import javax.swing.event.HyperlinkEvent;
|
|
||||||
import javax.swing.event.HyperlinkListener;
|
|
||||||
|
|
||||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonParser;
|
|
||||||
|
|
||||||
import cpw.mods.fml.common.versioning.ComparableVersion;
|
import cpw.mods.fml.common.versioning.ComparableVersion;
|
||||||
import cpw.mods.fml.relauncher.FMLInjectionData;
|
|
||||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
|
||||||
import cpw.mods.fml.relauncher.IFMLCallHook;
|
import cpw.mods.fml.relauncher.IFMLCallHook;
|
||||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
|
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
|
||||||
import sun.misc.URLClassPath;
|
|
||||||
import sun.net.util.URLUtil;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For autodownloading stuff. This is really unoriginal, mostly ripped off FML, credits to cpw.
|
* For autodownloading stuff. This is really unoriginal, mostly ripped off FML, credits to cpw.
|
||||||
@@ -65,10 +19,6 @@ import sun.net.util.URLUtil;
|
|||||||
@MCVersion("1.7.10")
|
@MCVersion("1.7.10")
|
||||||
public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
|
public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
|
||||||
|
|
||||||
private static ByteBuffer downloadBuffer = ByteBuffer.allocateDirect(1 << 23);
|
|
||||||
private static final String owner = "CB's DepLoader";
|
|
||||||
private static DepLoadInst inst;
|
|
||||||
|
|
||||||
public interface IDownloadDisplay {
|
public interface IDownloadDisplay {
|
||||||
|
|
||||||
void resetProgress(int sizeGuess);
|
void resetProgress(int sizeGuess);
|
||||||
@@ -89,140 +39,39 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
|
|||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public static class Downloader extends JOptionPane implements IDownloadDisplay {
|
public static class Downloader extends JOptionPane implements IDownloadDisplay {
|
||||||
|
|
||||||
private JDialog container;
|
|
||||||
private JLabel currentActivity;
|
|
||||||
private JProgressBar progress;
|
|
||||||
boolean stopIt;
|
boolean stopIt;
|
||||||
Thread pokeThread;
|
Thread pokeThread;
|
||||||
|
|
||||||
private Box makeProgressPanel() {
|
private Box makeProgressPanel() {
|
||||||
Box box = Box.createVerticalBox();
|
return null;
|
||||||
box.add(Box.createRigidArea(new Dimension(0, 10)));
|
|
||||||
JLabel welcomeLabel = new JLabel(
|
|
||||||
"<html><b><font size='+1'>" + owner
|
|
||||||
+ " is setting up your minecraft environment</font></b></html>");
|
|
||||||
box.add(welcomeLabel);
|
|
||||||
welcomeLabel.setAlignmentY(LEFT_ALIGNMENT);
|
|
||||||
welcomeLabel = new JLabel(
|
|
||||||
"<html>Please wait, " + owner + " has some tasks to do before you can play</html>");
|
|
||||||
welcomeLabel.setAlignmentY(LEFT_ALIGNMENT);
|
|
||||||
box.add(welcomeLabel);
|
|
||||||
box.add(Box.createRigidArea(new Dimension(0, 10)));
|
|
||||||
currentActivity = new JLabel("Currently doing ...");
|
|
||||||
box.add(currentActivity);
|
|
||||||
box.add(Box.createRigidArea(new Dimension(0, 10)));
|
|
||||||
progress = new JProgressBar(0, 100);
|
|
||||||
progress.setStringPainted(true);
|
|
||||||
box.add(progress);
|
|
||||||
box.add(Box.createRigidArea(new Dimension(0, 30)));
|
|
||||||
return box;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JDialog makeDialog() {
|
public JDialog makeDialog() {
|
||||||
if (container != null) return container;
|
return null;
|
||||||
|
|
||||||
setMessageType(JOptionPane.INFORMATION_MESSAGE);
|
|
||||||
setMessage(makeProgressPanel());
|
|
||||||
setOptions(new Object[] { "Stop" });
|
|
||||||
addPropertyChangeListener(new PropertyChangeListener() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void propertyChange(PropertyChangeEvent evt) {
|
|
||||||
if (evt.getSource() == Downloader.this && evt.getPropertyName() == VALUE_PROPERTY) {
|
|
||||||
requestClose("This will stop minecraft from launching\nAre you sure you want to do this?");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
container = new JDialog(null, "Hello", ModalityType.MODELESS);
|
|
||||||
container.setResizable(false);
|
|
||||||
container.setLocationRelativeTo(null);
|
|
||||||
container.add(this);
|
|
||||||
this.updateUI();
|
|
||||||
container.pack();
|
|
||||||
container.setMinimumSize(container.getPreferredSize());
|
|
||||||
container.setVisible(true);
|
|
||||||
container.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
|
|
||||||
container.addWindowListener(new WindowAdapter() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void windowClosing(WindowEvent e) {
|
|
||||||
requestClose(
|
|
||||||
"Closing this window will stop minecraft from launching\nAre you sure you wish to do this?");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return container;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void requestClose(String message) {
|
protected void requestClose(String message) {}
|
||||||
int shouldClose = JOptionPane.showConfirmDialog(
|
|
||||||
container,
|
|
||||||
message,
|
|
||||||
"Are you sure you want to stop?",
|
|
||||||
JOptionPane.YES_NO_OPTION,
|
|
||||||
JOptionPane.WARNING_MESSAGE);
|
|
||||||
if (shouldClose == JOptionPane.YES_OPTION) container.dispose();
|
|
||||||
|
|
||||||
stopIt = true;
|
|
||||||
if (pokeThread != null) pokeThread.interrupt();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateProgressString(String progressUpdate, Object... data) {
|
public void updateProgressString(String progressUpdate, Object... data) {}
|
||||||
// FMLLog.finest(progressUpdate, data);
|
|
||||||
if (currentActivity != null) currentActivity.setText(String.format(progressUpdate, data));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void resetProgress(int sizeGuess) {
|
public void resetProgress(int sizeGuess) {}
|
||||||
if (progress != null) progress.getModel().setRangeProperties(0, 0, 0, sizeGuess, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateProgress(int fullLength) {
|
public void updateProgress(int fullLength) {}
|
||||||
if (progress != null) progress.getModel().setValue(fullLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPokeThread(Thread currentThread) {
|
public void setPokeThread(Thread currentThread) {}
|
||||||
this.pokeThread = currentThread;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldStopIt() {
|
public boolean shouldStopIt() {
|
||||||
return stopIt;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void showErrorDialog(String name, String url) {
|
public void showErrorDialog(String name, String url) {}
|
||||||
JEditorPane ep = new JEditorPane(
|
|
||||||
"text/html",
|
|
||||||
"<html>" + owner
|
|
||||||
+ " was unable to download required library "
|
|
||||||
+ name
|
|
||||||
+ "<br>Check your internet connection and try restarting or download it manually from"
|
|
||||||
+ "<br><a href=\""
|
|
||||||
+ url
|
|
||||||
+ "\">"
|
|
||||||
+ url
|
|
||||||
+ "</a> and put it in your mods folder"
|
|
||||||
+ "</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 e) {}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
JOptionPane.showMessageDialog(null, ep, "A download error has occurred", JOptionPane.ERROR_MESSAGE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class DummyDownloader implements IDownloadDisplay {
|
public static class DummyDownloader implements IDownloadDisplay {
|
||||||
@@ -298,316 +147,12 @@ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook {
|
|||||||
|
|
||||||
public static class DepLoadInst {
|
public static class DepLoadInst {
|
||||||
|
|
||||||
private File modsDir;
|
public DepLoadInst() {}
|
||||||
private File v_modsDir;
|
|
||||||
private IDownloadDisplay downloadMonitor;
|
|
||||||
private JDialog popupWindow;
|
|
||||||
|
|
||||||
private Map<String, Dependency> depMap = new HashMap<String, Dependency>();
|
public void load() {}
|
||||||
private HashSet<String> depSet = new HashSet<String>();
|
|
||||||
|
|
||||||
public DepLoadInst() {
|
|
||||||
String mcVer = (String) FMLInjectionData.data()[4];
|
|
||||||
File mcDir = (File) FMLInjectionData.data()[6];
|
|
||||||
|
|
||||||
modsDir = new File(mcDir, "mods");
|
|
||||||
v_modsDir = new File(mcDir, "mods/" + mcVer);
|
|
||||||
if (!v_modsDir.exists()) v_modsDir.mkdirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addClasspath(String name) {
|
|
||||||
try {
|
|
||||||
((LaunchClassLoader) DepLoader.class.getClassLoader())
|
|
||||||
.addURL(new File(v_modsDir, name).toURI().toURL());
|
|
||||||
} catch (MalformedURLException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void deleteMod(File mod) {
|
|
||||||
if (mod.delete()) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
ClassLoader cl = DepLoader.class.getClassLoader();
|
|
||||||
URL url = mod.toURI().toURL();
|
|
||||||
Field f_ucp = URLClassLoader.class.getDeclaredField("ucp");
|
|
||||||
Field f_loaders = URLClassPath.class.getDeclaredField("loaders");
|
|
||||||
Field f_lmap = URLClassPath.class.getDeclaredField("lmap");
|
|
||||||
f_ucp.setAccessible(true);
|
|
||||||
f_loaders.setAccessible(true);
|
|
||||||
f_lmap.setAccessible(true);
|
|
||||||
|
|
||||||
URLClassPath ucp = (URLClassPath) f_ucp.get(cl);
|
|
||||||
Closeable loader = ((Map<String, Closeable>) f_lmap.get(ucp)).remove(URLUtil.urlNoFragString(url));
|
|
||||||
if (loader != null) {
|
|
||||||
loader.close();
|
|
||||||
((List<?>) f_loaders.get(ucp)).remove(loader);
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!mod.delete()) {
|
|
||||||
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.";
|
|
||||||
CodeChickenCorePlugin.logger.error(msg);
|
|
||||||
if (!GraphicsEnvironment.isHeadless())
|
|
||||||
JOptionPane.showMessageDialog(null, msg, "An update error has occurred", JOptionPane.ERROR_MESSAGE);
|
|
||||||
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void download(Dependency dep) {
|
|
||||||
popupWindow = (JDialog) downloadMonitor.makeDialog();
|
|
||||||
File libFile = new File(v_modsDir, dep.file.filename);
|
|
||||||
try {
|
|
||||||
URL libDownload = new URL(dep.url + '/' + dep.file.filename);
|
|
||||||
downloadMonitor.updateProgressString("Downloading file %s", libDownload.toString());
|
|
||||||
CodeChickenCorePlugin.logger.debug("Downloading file " + libDownload);
|
|
||||||
URLConnection connection = libDownload.openConnection();
|
|
||||||
connection.setConnectTimeout(5000);
|
|
||||||
connection.setReadTimeout(5000);
|
|
||||||
connection.setRequestProperty("User-Agent", "" + owner + " Downloader");
|
|
||||||
int sizeGuess = connection.getContentLength();
|
|
||||||
download(connection.getInputStream(), sizeGuess, libFile);
|
|
||||||
downloadMonitor.updateProgressString("Download complete");
|
|
||||||
CodeChickenCorePlugin.logger.trace("Download complete");
|
|
||||||
|
|
||||||
scanDepInfo(libFile);
|
|
||||||
} catch (Exception e) {
|
|
||||||
libFile.delete();
|
|
||||||
if (downloadMonitor.shouldStopIt()) {
|
|
||||||
CodeChickenCorePlugin.logger
|
|
||||||
.error("You have stopped the downloading operation before it could complete");
|
|
||||||
System.exit(1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
downloadMonitor.showErrorDialog(dep.file.filename, dep.url + '/' + dep.file.filename);
|
|
||||||
throw new RuntimeException("A download error occured", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void download(InputStream is, int sizeGuess, File target) throws Exception {
|
|
||||||
if (sizeGuess > downloadBuffer.capacity()) throw new Exception(
|
|
||||||
String.format(
|
|
||||||
"The file %s is too large to be downloaded by " + owner + " - the download is invalid",
|
|
||||||
target.getName()));
|
|
||||||
|
|
||||||
downloadBuffer.clear();
|
|
||||||
|
|
||||||
int bytesRead, fullLength = 0;
|
|
||||||
|
|
||||||
downloadMonitor.resetProgress(sizeGuess);
|
|
||||||
try {
|
|
||||||
downloadMonitor.setPokeThread(Thread.currentThread());
|
|
||||||
byte[] smallBuffer = new byte[1024];
|
|
||||||
while ((bytesRead = is.read(smallBuffer)) >= 0) {
|
|
||||||
downloadBuffer.put(smallBuffer, 0, bytesRead);
|
|
||||||
fullLength += bytesRead;
|
|
||||||
if (downloadMonitor.shouldStopIt()) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
downloadMonitor.updateProgress(fullLength);
|
|
||||||
}
|
|
||||||
is.close();
|
|
||||||
downloadMonitor.setPokeThread(null);
|
|
||||||
downloadBuffer.limit(fullLength);
|
|
||||||
downloadBuffer.position(0);
|
|
||||||
} catch (InterruptedIOException e) {
|
|
||||||
// We were interrupted by the stop button. We're stopping now.. clear interruption flag.
|
|
||||||
Thread.interrupted();
|
|
||||||
throw new Exception("Stop");
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
/*
|
|
||||||
* String cksum = generateChecksum(downloadBuffer); if (cksum.equals(validationHash)) {
|
|
||||||
*/
|
|
||||||
if (!target.exists()) target.createNewFile();
|
|
||||||
|
|
||||||
downloadBuffer.position(0);
|
|
||||||
FileOutputStream fos = new FileOutputStream(target);
|
|
||||||
fos.getChannel().write(downloadBuffer);
|
|
||||||
fos.close();
|
|
||||||
/*
|
|
||||||
* } else { throw new RuntimeException(String.
|
|
||||||
* format("The downloaded file %s has an invalid checksum %s (expecting %s). The download did not succeed correctly and the file has been deleted. Please try launching again."
|
|
||||||
* , target.getName(), cksum, validationHash)); }
|
|
||||||
*/
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String checkExisting(Dependency dep) {
|
|
||||||
for (File f : modsDir.listFiles()) {
|
|
||||||
VersionedFile vfile = new VersionedFile(f.getName(), dep.file.pattern);
|
|
||||||
if (!vfile.matches() || !vfile.name.equals(dep.file.name)) continue;
|
|
||||||
|
|
||||||
if (f.renameTo(new File(v_modsDir, f.getName()))) continue;
|
|
||||||
|
|
||||||
deleteMod(f);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (File f : v_modsDir.listFiles()) {
|
|
||||||
VersionedFile vfile = new VersionedFile(f.getName(), dep.file.pattern);
|
|
||||||
if (!vfile.matches() || !vfile.name.equals(dep.file.name)) continue;
|
|
||||||
|
|
||||||
int cmp = vfile.version.compareTo(dep.file.version);
|
|
||||||
if (cmp < 0) {
|
|
||||||
CodeChickenCorePlugin.logger.warn("Deleted old version " + f.getName());
|
|
||||||
deleteMod(f);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (cmp > 0) {
|
|
||||||
CodeChickenCorePlugin.logger.warn(
|
|
||||||
"Warning: version of " + dep.file.name
|
|
||||||
+ ", "
|
|
||||||
+ vfile.version
|
|
||||||
+ " is newer than request "
|
|
||||||
+ dep.file.version);
|
|
||||||
return f.getName();
|
|
||||||
}
|
|
||||||
return f.getName(); // found dependency
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void load() {
|
|
||||||
scanDepInfos();
|
|
||||||
if (depMap.isEmpty()) return;
|
|
||||||
|
|
||||||
loadDeps();
|
|
||||||
activateDeps();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void activateDeps() {
|
|
||||||
for (Dependency dep : depMap.values()) if (dep.coreLib) addClasspath(dep.existing);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadDeps() {
|
|
||||||
downloadMonitor = FMLLaunchHandler.side().isClient() ? new Downloader() : new DummyDownloader();
|
|
||||||
try {
|
|
||||||
while (!depSet.isEmpty()) {
|
|
||||||
Iterator<String> it = depSet.iterator();
|
|
||||||
Dependency dep = depMap.get(it.next());
|
|
||||||
it.remove();
|
|
||||||
load(dep);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
if (popupWindow != null) {
|
|
||||||
popupWindow.setVisible(false);
|
|
||||||
popupWindow.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void load(Dependency dep) {
|
|
||||||
dep.existing = checkExisting(dep);
|
|
||||||
if (dep.existing == null) // download dep
|
|
||||||
{
|
|
||||||
download(dep);
|
|
||||||
dep.existing = dep.file.filename;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<File> modFiles() {
|
|
||||||
List<File> list = new LinkedList<File>();
|
|
||||||
list.addAll(Arrays.asList(modsDir.listFiles()));
|
|
||||||
list.addAll(Arrays.asList(v_modsDir.listFiles()));
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void scanDepInfos() {
|
|
||||||
for (File file : modFiles()) {
|
|
||||||
if (!file.getName().endsWith(".jar") && !file.getName().endsWith(".zip")) continue;
|
|
||||||
|
|
||||||
scanDepInfo(file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void scanDepInfo(File file) {
|
|
||||||
try {
|
|
||||||
ZipFile zip = new ZipFile(file);
|
|
||||||
ZipEntry e = zip.getEntry("dependancies.info");
|
|
||||||
if (e == null) e = zip.getEntry("dependencies.info");
|
|
||||||
if (e != null) loadJSon(zip.getInputStream(e));
|
|
||||||
zip.close();
|
|
||||||
} catch (Exception e) {
|
|
||||||
CodeChickenCorePlugin.logger
|
|
||||||
.error("Failed to load dependencies.info from " + file.getName() + " as JSON");
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadJSon(InputStream input) throws IOException {
|
|
||||||
InputStreamReader reader = new InputStreamReader(input);
|
|
||||||
JsonElement root = new JsonParser().parse(reader);
|
|
||||||
if (root.isJsonArray()) loadJSonArr(root);
|
|
||||||
else loadJson(root.getAsJsonObject());
|
|
||||||
reader.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadJSonArr(JsonElement root) throws IOException {
|
|
||||||
for (JsonElement node : root.getAsJsonArray()) loadJson(node.getAsJsonObject());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadJson(JsonObject node) throws IOException {
|
|
||||||
boolean obfuscated = ((LaunchClassLoader) DepLoader.class.getClassLoader())
|
|
||||||
.getClassBytes("net.minecraft.world.World") == null;
|
|
||||||
|
|
||||||
String testClass = node.get("class").getAsString();
|
|
||||||
if (DepLoader.class.getResource("/" + testClass.replace('.', '/') + ".class") != null) return;
|
|
||||||
|
|
||||||
String repo = node.get("repo").getAsString();
|
|
||||||
String filename = node.get("file").getAsString();
|
|
||||||
if (!obfuscated && node.has("dev")) filename = node.get("dev").getAsString();
|
|
||||||
|
|
||||||
boolean coreLib = node.has("coreLib") && node.get("coreLib").getAsBoolean();
|
|
||||||
|
|
||||||
Pattern pattern = null;
|
|
||||||
try {
|
|
||||||
if (node.has("pattern")) pattern = Pattern.compile(node.get("pattern").getAsString());
|
|
||||||
} catch (PatternSyntaxException e) {
|
|
||||||
CodeChickenCorePlugin.logger.error("Invalid filename pattern: " + node.get("pattern"));
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
if (pattern == null) pattern = Pattern.compile("(\\w+).*?([\\d\\.]+)[-\\w]*\\.[^\\d]+");
|
|
||||||
|
|
||||||
VersionedFile file = new VersionedFile(filename, pattern);
|
|
||||||
if (!file.matches()) throw new RuntimeException("Invalid filename format for dependency: " + filename);
|
|
||||||
|
|
||||||
addDep(new Dependency(repo, file, coreLib));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addDep(Dependency newDep) {
|
|
||||||
if (mergeNew(depMap.get(newDep.file.name), newDep)) {
|
|
||||||
depMap.put(newDep.file.name, newDep);
|
|
||||||
depSet.add(newDep.file.name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean mergeNew(Dependency oldDep, Dependency newDep) {
|
|
||||||
if (oldDep == null) return true;
|
|
||||||
|
|
||||||
Dependency newest = newDep.file.version.compareTo(oldDep.file.version) > 0 ? newDep : oldDep;
|
|
||||||
newest.coreLib = newDep.coreLib || oldDep.coreLib;
|
|
||||||
|
|
||||||
return newest == newDep;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void load() {
|
public static void load() {}
|
||||||
if (inst == null) {
|
|
||||||
inst = new DepLoadInst();
|
|
||||||
inst.load();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getASMTransformerClass() {
|
public String[] getASMTransformerClass() {
|
||||||
|
|||||||
@@ -7,6 +7,6 @@
|
|||||||
"version": "${modVersion}",
|
"version": "${modVersion}",
|
||||||
"mcversion": "${minecraftVersion}",
|
"mcversion": "${minecraftVersion}",
|
||||||
"url": "http://www.minecraftforum.net/topic/909223",
|
"url": "http://www.minecraftforum.net/topic/909223",
|
||||||
"authorList": ["ChickenBones"]
|
"authorList": ["ChickenBones", "GTNH Team"]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user