mirror of
https://github.com/GTNewHorizons/ForgeRelocation.git
synced 2026-11-13 00:47:36 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c75c509fda | ||
|
|
b2c051b597 | ||
|
|
5b34a69e2b | ||
|
|
582ed32314 | ||
|
|
f1324c86be | ||
|
|
77d2debe5d | ||
|
|
cca754773a | ||
|
|
ebc1762cb6 | ||
|
|
6820516d89 | ||
|
|
3529de5863 |
No files matched your search
+2
-1602
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
dependencies {
|
dependencies {
|
||||||
api 'com.github.GTNewHorizons:MrTJPCore:1.1.5:dev'
|
api 'com.github.GTNewHorizons:MrTJPCore:1.3.0:dev'
|
||||||
}
|
}
|
||||||
+124
-37
@@ -1,65 +1,109 @@
|
|||||||
|
# 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 = ForgeRelocation
|
modName = ForgeRelocation
|
||||||
|
|
||||||
# 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 = ForgeRelocation
|
modId = ForgeRelocation
|
||||||
|
|
||||||
|
# Root package of the mod, used to find various classes in other properties,
|
||||||
|
# mcmod.info substitution, enabling assertions in run tasks, etc.
|
||||||
modGroup = mrtjp.relocation
|
modGroup = mrtjp.relocation
|
||||||
|
|
||||||
# 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
|
# When false, com.github.GTNewHorizons is used.
|
||||||
# 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
|
||||||
|
|
||||||
# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
|
# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
|
||||||
channel = stable
|
channel = stable
|
||||||
|
|
||||||
|
# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
|
||||||
mappingsVersion = 12
|
mappingsVersion = 12
|
||||||
|
|
||||||
# Define other MCP mappings for dependency deobfuscation
|
# Defines other MCP mappings for dependency deobfuscation.
|
||||||
remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
|
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
|
||||||
|
|
||||||
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
|
# Select a default username for testing your mod. You can always override this per-run by running
|
||||||
# restart Minecraft in development. Choose this dependent on your mod:
|
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
|
||||||
# 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
|
|
||||||
developmentEnvironmentUserName = Developer
|
developmentEnvironmentUserName = Developer
|
||||||
|
|
||||||
# Define a source file of your project with:
|
# 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 = mrtjp.relocation.Tags
|
||||||
|
|
||||||
|
# Name of the token containing the project's current version to generate/replace.
|
||||||
|
gradleTokenVersion = VERSION
|
||||||
|
|
||||||
|
# [DEPRECATED] Mod ID replacement token.
|
||||||
|
gradleTokenModId =
|
||||||
|
|
||||||
|
# [DEPRECATED] Mod name replacement token.
|
||||||
|
gradleTokenModName =
|
||||||
|
|
||||||
|
# [DEPRECATED] Mod Group replacement token.
|
||||||
|
gradleTokenGroupName =
|
||||||
|
|
||||||
|
# [DEPRECATED]
|
||||||
|
# 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 = mod.scala,package-info.java
|
replaceGradleTokenInFile =
|
||||||
gradleTokenModId =
|
|
||||||
gradleTokenModName =
|
|
||||||
gradleTokenVersion = GRADLETOKEN_VERSION
|
|
||||||
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 =
|
||||||
|
|
||||||
# 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
|
||||||
# Adds some debug arguments like verbose output and export
|
|
||||||
|
# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
|
||||||
|
# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
|
||||||
|
# Mixin classes will have access to "main" classes, but not the other way around.
|
||||||
|
separateMixinSourceSet =
|
||||||
|
|
||||||
|
# Adds some debug arguments like verbose output and class export.
|
||||||
usesMixinDebug = false
|
usesMixinDebug = false
|
||||||
|
|
||||||
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
# 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 =
|
coreModClass =
|
||||||
|
|
||||||
# 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 = false
|
containsMixinsAndOrCoreModOnly = false
|
||||||
@@ -67,15 +111,38 @@ containsMixinsAndOrCoreModOnly = false
|
|||||||
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
|
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
|
||||||
forceEnableMixins = false
|
forceEnableMixins = false
|
||||||
|
|
||||||
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
|
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
|
||||||
# responsibility check the licence and request permission for distribution, if required.
|
# responsibility to check the license and request permission for distribution if required.
|
||||||
usesShadowedDependencies = false
|
usesShadowedDependencies = false
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
|
# If disabled, won't rename the shadowed classes.
|
||||||
|
relocateShadowedDependencies = true
|
||||||
|
|
||||||
|
# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||||
|
includeWellKnownRepositories = true
|
||||||
|
|
||||||
|
# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
|
||||||
|
# list of strings, with the acceptable keys being(case does not matter):
|
||||||
|
# cursemaven
|
||||||
|
# modrinth
|
||||||
|
excludeWellKnownRepositories =
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# 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 =
|
modrinthProjectId =
|
||||||
|
|
||||||
# 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,9 +154,8 @@ modrinthProjectId =
|
|||||||
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
|
# 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.
|
# 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.
|
# 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.
|
# Leave this empty if you don't want to publish on CurseForge.
|
||||||
curseForgeProjectId =
|
curseForgeProjectId =
|
||||||
@@ -99,18 +165,39 @@ curseForgeProjectId =
|
|||||||
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
|
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
|
||||||
# and the name is the CurseForge project slug of the other mod.
|
# and the name is the CurseForge project slug of the other mod.
|
||||||
# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
|
# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
|
||||||
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
|
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
|
||||||
curseForgeRelations =
|
curseForgeRelations =
|
||||||
|
|
||||||
|
# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
|
||||||
# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
|
|
||||||
# projects. New projects should not use this parameter.
|
# projects. New projects should not use this parameter.
|
||||||
# customArchiveBaseName =
|
# customArchiveBaseName =
|
||||||
|
|
||||||
# Optional parameter to prevent the source code from being published
|
# Optional parameter to have the build automatically fail if an illegal version is used.
|
||||||
# noPublishedSources =
|
# 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 this to disable spotless checks
|
# 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.
|
# 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.
|
# That is, if there is no other active fork/upstream, NEVER change this.
|
||||||
# disableSpotless = true
|
# 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.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,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/.
|
||||||
@@ -84,7 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# 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
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# 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
|
||||||
@@ -203,7 +205,7 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# 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
|
# * 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.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|||||||
Vendored
+12
-10
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -43,11 +45,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 +59,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
|
||||||
|
|
||||||
|
|||||||
+3
-7
@@ -6,6 +6,7 @@ pluginManagement {
|
|||||||
name "GTNH Maven"
|
name "GTNH Maven"
|
||||||
url "https://nexus.gtnewhorizons.com/repository/public/"
|
url "https://nexus.gtnewhorizons.com/repository/public/"
|
||||||
mavenContent {
|
mavenContent {
|
||||||
|
includeGroup("com.gtnewhorizons")
|
||||||
includeGroupByRegex("com\\.gtnewhorizons\\..+")
|
includeGroupByRegex("com\\.gtnewhorizons\\..+")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,12 +17,7 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.diffplug.blowdryerSetup' version '1.7.1'
|
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.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,2 +1,5 @@
|
|||||||
|
tile.relocation.blockmovingrow.name=Moving Block
|
||||||
|
|
||||||
tile.mcframes.frame.name=Frame
|
tile.mcframes.frame.name=Frame
|
||||||
tile.mcframes.motor|0.name=Debug Frame Motor
|
tile.mcframes.motor.name=Debug Frame Motor
|
||||||
|
tile.mcframes.motor|0.name=Debug Frame Motor
|
||||||
@@ -12,11 +12,7 @@
|
|||||||
"credits": "",
|
"credits": "",
|
||||||
"logoFile": "",
|
"logoFile": "",
|
||||||
"screenshots": [],
|
"screenshots": [],
|
||||||
"parent": "",
|
"parent": ""
|
||||||
"requiredMods": ["MrTJPCoreMod"],
|
|
||||||
"dependencies": [],
|
|
||||||
"dependants": [],
|
|
||||||
"useDependencyInformation": true
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"modid": "MCFrames",
|
"modid": "MCFrames",
|
||||||
@@ -30,10 +26,6 @@
|
|||||||
"credits": "",
|
"credits": "",
|
||||||
"logoFile": "fr_logo.png",
|
"logoFile": "fr_logo.png",
|
||||||
"screenshots": [],
|
"screenshots": [],
|
||||||
"parent": "",
|
"parent": ""
|
||||||
"requiredMods": ["${modId}"],
|
|
||||||
"dependencies": [],
|
|
||||||
"dependants": [],
|
|
||||||
"useDependencyInformation": true
|
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
@@ -2,5 +2,27 @@
|
|||||||
* Copyright (c) 2015. Created by MrTJP. All rights reserved.
|
* Copyright (c) 2015. Created by MrTJP. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// @API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = "GRADLETOKEN_VERSION")
|
// spotless:off
|
||||||
|
//
|
||||||
|
// You may wonder, "why is this commented out?"
|
||||||
|
// When FML sorts the modcontainers, it includes APIs. The API's dependency is always its owner but if an API is found
|
||||||
|
// embedded in a mod which isn't the owner, that mod is set as the API's dependant. In this case, the same jar contains
|
||||||
|
// both ForgeRelocation and MCFrames, each with an API. So when FML determins which APIs are embedded where, it sees
|
||||||
|
// MCFrames|API embedded in ForgeRelocation and ForgeRelocation|API embedded in MCFrames. This results in the following
|
||||||
|
// circular load order:
|
||||||
|
//
|
||||||
|
// MCFrames --------------> MCFrames|API <----+
|
||||||
|
// ^ ^ | |
|
||||||
|
// | | | |
|
||||||
|
// | +-------------------+ | +- MrTJPCore
|
||||||
|
// | | | |
|
||||||
|
// | | v |
|
||||||
|
// ForgeRelocation|API <--- ForgeRelocation <-+
|
||||||
|
//
|
||||||
|
// spotless:on
|
||||||
|
|
||||||
|
// @API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = Tags.VERSION)
|
||||||
package mrtjp.mcframes.api;
|
package mrtjp.mcframes.api;
|
||||||
|
|
||||||
|
// import cpw.mods.fml.common.API;
|
||||||
|
// import mrtjp.relocation.Tags;
|
||||||
@@ -190,9 +190,10 @@ object RenderFrame extends ISimpleBlockRenderingHandler {
|
|||||||
meta: Int
|
meta: Int
|
||||||
) {
|
) {
|
||||||
TextureUtils.bindAtlas(0)
|
TextureUtils.bindAtlas(0)
|
||||||
CCRenderState.reset()
|
val state = CCRenderState.instance
|
||||||
CCRenderState.lightMatrix.locate(w, x, y, z)
|
state.resetInstance()
|
||||||
CCRenderState.setBrightness(w, x, y, z)
|
state.lightMatrix.locate(w, x, y, z)
|
||||||
|
state.setBrightnessInstance(w, x, y, z)
|
||||||
|
|
||||||
if (r.hasOverrideBlockTexture) {
|
if (r.hasOverrideBlockTexture) {
|
||||||
getOrGenerateModel(0).render(
|
getOrGenerateModel(0).render(
|
||||||
@@ -204,15 +205,16 @@ object RenderFrame extends ISimpleBlockRenderingHandler {
|
|||||||
|
|
||||||
def renderInvBlock(r: RenderBlocks, meta: Int) {
|
def renderInvBlock(r: RenderBlocks, meta: Int) {
|
||||||
TextureUtils.bindAtlas(0)
|
TextureUtils.bindAtlas(0)
|
||||||
CCRenderState.reset()
|
val state = CCRenderState.instance
|
||||||
CCRenderState.setDynamic()
|
state.resetInstance()
|
||||||
CCRenderState.pullLightmap()
|
state.setDynamicInstance()
|
||||||
|
state.pullLightmapInstance()
|
||||||
|
|
||||||
CCRenderState.startDrawing()
|
state.startDrawingInstance()
|
||||||
RenderFrame.render(new Vector3(-0.5, -0.5, -0.5), 0)
|
RenderFrame.render(new Vector3(-0.5, -0.5, -0.5), 0)
|
||||||
|
|
||||||
CCRenderState.render()
|
state.renderInstance()
|
||||||
CCRenderState.draw()
|
state.drawInstance()
|
||||||
}
|
}
|
||||||
|
|
||||||
def registerIcons(reg: IIconRegister) {
|
def registerIcons(reg: IIconRegister) {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import cpw.mods.fml.common.event.{
|
|||||||
import mrtjp.core.data.{ModConfig, SpecialConfigGui, TModGuiFactory}
|
import mrtjp.core.data.{ModConfig, SpecialConfigGui, TModGuiFactory}
|
||||||
import mrtjp.mcframes.api.MCFramesAPI
|
import mrtjp.mcframes.api.MCFramesAPI
|
||||||
import mrtjp.mcframes.{BlockFrame, BlockMotor, StickRegistry}
|
import mrtjp.mcframes.{BlockFrame, BlockMotor, StickRegistry}
|
||||||
|
import mrtjp.relocation.Tags
|
||||||
import net.minecraft.client.gui.GuiScreen
|
import net.minecraft.client.gui.GuiScreen
|
||||||
|
|
||||||
@Mod(
|
@Mod(
|
||||||
@@ -31,7 +32,7 @@ object MCFramesMod {
|
|||||||
|
|
||||||
final val modID = "MCFrames"
|
final val modID = "MCFrames"
|
||||||
final val modName = "MCFrames"
|
final val modName = "MCFrames"
|
||||||
final val version = "GRADLETOKEN_VERSION"
|
final val version = Tags.VERSION
|
||||||
|
|
||||||
var blockFrame: BlockFrame = _
|
var blockFrame: BlockFrame = _
|
||||||
var blockMotor: BlockMotor = _
|
var blockMotor: BlockMotor = _
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
* Copyright (c) 2015. Created by MrTJP. All rights reserved.
|
* Copyright (c) 2015. Created by MrTJP. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = "GRADLETOKEN_VERSION")
|
@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = Tags.VERSION)
|
||||||
package mrtjp.relocation.api;
|
package mrtjp.relocation.api;
|
||||||
|
|
||||||
import cpw.mods.fml.common.API;
|
import cpw.mods.fml.common.API;
|
||||||
|
import mrtjp.relocation.Tags;
|
||||||
@@ -14,6 +14,7 @@ import cpw.mods.fml.common.event.{
|
|||||||
import mrtjp.core.data.{ModConfig, SpecialConfigGui, TModGuiFactory}
|
import mrtjp.core.data.{ModConfig, SpecialConfigGui, TModGuiFactory}
|
||||||
import mrtjp.relocation.api._
|
import mrtjp.relocation.api._
|
||||||
import mrtjp.relocation.{BlockMovingRow, MovingTileRegistry}
|
import mrtjp.relocation.{BlockMovingRow, MovingTileRegistry}
|
||||||
|
import mrtjp.relocation.Tags
|
||||||
import net.minecraft.client.gui.GuiScreen
|
import net.minecraft.client.gui.GuiScreen
|
||||||
import org.apache.logging.log4j.LogManager
|
import org.apache.logging.log4j.LogManager
|
||||||
|
|
||||||
@@ -32,7 +33,7 @@ object RelocationMod {
|
|||||||
|
|
||||||
final val modID = "ForgeRelocation"
|
final val modID = "ForgeRelocation"
|
||||||
final val modName = "ForgeRelocation"
|
final val modName = "ForgeRelocation"
|
||||||
final val version = "GRADLETOKEN_VERSION"
|
final val version = Tags.VERSION
|
||||||
|
|
||||||
val log = LogManager.getFormatterLogger(modID)
|
val log = LogManager.getFormatterLogger(modID)
|
||||||
|
|
||||||
|
|||||||
@@ -17,17 +17,18 @@ import net.minecraft.client.Minecraft
|
|||||||
import net.minecraft.init.Blocks
|
import net.minecraft.init.Blocks
|
||||||
import net.minecraft.world.{ChunkCoordIntPair, World}
|
import net.minecraft.world.{ChunkCoordIntPair, World}
|
||||||
import net.minecraftforge.common.DimensionManager
|
import net.minecraftforge.common.DimensionManager
|
||||||
|
import scala.collection.concurrent.TrieMap
|
||||||
import scala.collection.mutable.{
|
import scala.collection.mutable.{
|
||||||
HashMap => MHashMap,
|
HashMap => MHashMap,
|
||||||
MultiMap => MMultiMap,
|
MultiMap => MMultiMap,
|
||||||
Set => MSet
|
Set => MSet
|
||||||
}
|
}
|
||||||
|
|
||||||
import scala.ref.WeakReference
|
import scala.ref.WeakReference
|
||||||
|
|
||||||
object MovementManager2 {
|
object MovementManager2 {
|
||||||
val serverRelocations = MHashMap[Int, WorldStructs]()
|
val serverRelocations = MHashMap[Int, WorldStructs]()
|
||||||
val clientRelocations = MHashMap[Int, WorldStructs]()
|
val clientRelocations = TrieMap[Int, WorldStructs]()
|
||||||
|
|
||||||
def relocationMap(isClient: Boolean) =
|
def relocationMap(isClient: Boolean) =
|
||||||
if (isClient) clientRelocations else serverRelocations
|
if (isClient) clientRelocations else serverRelocations
|
||||||
@@ -106,8 +107,10 @@ object MovementManager2 {
|
|||||||
RelocationSPH.forceSendData()
|
RelocationSPH.forceSendData()
|
||||||
}
|
}
|
||||||
|
|
||||||
def isMoving(w: World, x: Int, y: Int, z: Int) =
|
def isMoving(w: World, x: Int, y: Int, z: Int) = {
|
||||||
getWorldStructs(w).contains(x, y, z)
|
if (w == null) false
|
||||||
|
else getWorldStructs(w).contains(x, y, z)
|
||||||
|
}
|
||||||
|
|
||||||
def addStructToWorld(w: World, b: BlockStruct) {
|
def addStructToWorld(w: World, b: BlockStruct) {
|
||||||
getWorldStructs(w).addStruct(b)
|
getWorldStructs(w).addStruct(b)
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ object MovingRenderer {
|
|||||||
|
|
||||||
private def mc = Minecraft.getMinecraft
|
private def mc = Minecraft.getMinecraft
|
||||||
private def world = mc.theWorld
|
private def world = mc.theWorld
|
||||||
private def tes = Tessellator.instance
|
|
||||||
|
|
||||||
private def render(x: Int, y: Int, z: Int, rpos: Vector3) {
|
private def render(x: Int, y: Int, z: Int, rpos: Vector3) {
|
||||||
val oldOcclusion = mc.gameSettings.ambientOcclusion
|
val oldOcclusion = mc.gameSettings.ambientOcclusion
|
||||||
@@ -65,8 +64,9 @@ object MovingRenderer {
|
|||||||
)
|
)
|
||||||
|
|
||||||
for (pass <- 0 to 1) {
|
for (pass <- 0 to 1) {
|
||||||
tes.startDrawingQuads()
|
val tess = Tessellator.instance
|
||||||
tes.setTranslation(
|
tess.startDrawingQuads()
|
||||||
|
tess.setTranslation(
|
||||||
-TileEntityRendererDispatcher.staticPlayerX + MathLib
|
-TileEntityRendererDispatcher.staticPlayerX + MathLib
|
||||||
.clamp(-1f, 1f, rpos.x.toFloat),
|
.clamp(-1f, 1f, rpos.x.toFloat),
|
||||||
-TileEntityRendererDispatcher.staticPlayerY + MathLib
|
-TileEntityRendererDispatcher.staticPlayerY + MathLib
|
||||||
@@ -77,7 +77,7 @@ object MovingRenderer {
|
|||||||
rpos.z.toFloat
|
rpos.z.toFloat
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
tes.setColorOpaque(1, 1, 1)
|
tess.setColorOpaque(1, 1, 1)
|
||||||
|
|
||||||
block.getRenderBlockPass
|
block.getRenderBlockPass
|
||||||
if (block.canRenderInPass(pass)) {
|
if (block.canRenderInPass(pass)) {
|
||||||
@@ -86,8 +86,8 @@ object MovingRenderer {
|
|||||||
renderHack = true
|
renderHack = true
|
||||||
}
|
}
|
||||||
|
|
||||||
tes.setTranslation(0, 0, 0)
|
tess.setTranslation(0, 0, 0)
|
||||||
tes.draw()
|
tess.draw()
|
||||||
}
|
}
|
||||||
RenderHelper.enableStandardItemLighting()
|
RenderHelper.enableStandardItemLighting()
|
||||||
mc.entityRenderer.disableLightmap(frame)
|
mc.entityRenderer.disableLightmap(frame)
|
||||||
|
|||||||
Reference in new issue
Block a user